killbill 8.0.1 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a834348d6b8115a5a8d190e2ce745a34da421eb7
-  data.tar.gz: a08f6a4e1935133f056deaa0964921233004a06a
+  metadata.gz: f9438508ea82e8cb3524bd2146a134cd2ae24e20
+  data.tar.gz: d9fdc85585f4ec96b74d3f7d0d6693b0a90f8dfe
 SHA512:
-  metadata.gz: f11dd9342843f66646bf57e1c7fc654ab70b5457d1fb2d0d4b50ed7dc8a78d5a1f71db8cffb0020c7877f5420a71ea28c4761de39aa5a9ef16f9d6b3bccc2096
-  data.tar.gz: e163f77a24f26f3bfa67c5a6f04dca9e495df115c07ba8e3ed619ee1751550c5b3c8b1385b6c5b8dea743f498bcdb57b8e75684c42423afdd6cbd9127ba36b04
+  metadata.gz: 89d9cb497f5f92554530a1abc5816700b5e1670b5cc802c8777514eb2ca43e7c0528bd3e3564a9e26fe851eaa4b845e81711834f383e896f3ce219784c4a754b
+  data.tar.gz: 09f61dadb68b4374636e9d918bf50db75664c69d26df90df0fe700741f41a13cea8d5b31711223665593a39b4e140e7fc7e631b00e71db5debd46e16fb282aa2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill (8.0.1)
+    killbill (8.1.0)
       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.34'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.19'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.19'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.19'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.19'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.19'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.19'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.19'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.17.0'
-jar 'org.kill-bill.billing:killbill-util', '0.17.0'
+jar 'org.kill-bill.billing:killbill-api', '0.38'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.20'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.20'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.20'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.20'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.20'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.20'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.20'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.17.1'
+jar 'org.kill-bill.billing:killbill-util', '0.17.1'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/Jarfile.lock

@@ -1,64 +1,64 @@
 ---
 :runtime:
-- org.kill-bill.billing:killbill-platform-base:jar:0.27
+- org.kill-bill.commons:killbill-concurrent:jar:0.18
+- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.20
 - org.javassist:javassist:jar:3.19.0-GA
 - org.apache.shiro:shiro-core:jar:1.2.3
 - joda-time:joda-time:jar:2.3
-- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.19
 - net.sf.ehcache:ehcache:jar:2.9.1
 - aopalliance:aopalliance:jar:1.0
+- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.20
 - com.google.code.findbugs:annotations:jar:3.0.0
 - org.osgi:org.osgi.core:jar:5.0.0
-- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.19
+- org.kill-bill.billing:killbill-platform-api:jar:0.30
 - com.zaxxer:HikariCP-java6:jar:2.3.7
 - org.apache.shiro:shiro-guice:jar:1.2.3
-- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.19
+- org.kill-bill.billing:killbill-util:jar:tests:0.17.1
 - org.apache.commons:commons-email:jar:1.2
+- org.kill-bill.billing:killbill-platform-base:jar:0.30
 - org.skife.config:config-magic:jar:0.14
 - antlr:antlr:jar:2.7.7
-- org.kill-bill.billing:killbill-platform-api:jar:0.27
+- org.kill-bill.billing:killbill-util:jar:0.17.1
 - org.antlr:stringtemplate:jar:3.2.1
 - org.apache.shiro:shiro-ehcache:jar:1.2.3
 - org.joda:joda-money:jar:0.9
 - org.jdbi:jdbi:jar:2.62
 - com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
+- org.kill-bill.billing:killbill-internal-api:jar:0.17.1
+- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.20
+- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.30
 - com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.3
 - com.google.inject:guice:jar:3.0
 - com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
-- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.19
 - org.apache.felix:org.apache.felix.framework:jar:4.4.1
-- org.kill-bill.billing:killbill-api:jar:0.34
 - com.samskivert:jmustache:jar:1.5
-- org.kill-bill.commons:killbill-queue:jar:0.16
 - com.h2database:h2:jar:1.4.186
-- org.kill-bill.commons:killbill-jdbi:jar:0.16
-- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.27
+- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.20
 - org.slf4j:jcl-over-slf4j:jar:1.7.21
 - org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
-- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.16
-- org.kill-bill.billing:killbill-util:jar:0.17.0
+- org.kill-bill.commons:killbill-clock:jar:0.18
 - com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.3
-- org.kill-bill.billing:killbill-internal-api:jar:0.17.0
-- org.kill-bill.commons:killbill-concurrent:jar:0.16
+- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.20
+- org.kill-bill.billing:killbill-api:jar:0.38
 - com.fasterxml.jackson.core:jackson-core:jar:2.4.3
 - com.google.guava:guava:jar:r09
 - javax.mail:mail:jar:1.4.1
-- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.19
 - javax.activation:activation:jar:1.1
-- org.kill-bill.commons:killbill-xmlloader:jar:0.16
+- org.kill-bill.commons:killbill-locker:jar:0.18
 - io.dropwizard.metrics:metrics-core:jar:3.1.1
-- org.kill-bill.billing:killbill-platform-osgi:jar:0.27
-- org.kill-bill.commons:killbill-clock:jar:0.16
 - org.weakref:jmxutils:jar:1.18
 - com.google.inject.extensions:guice-multibindings:jar:3.0
 - javax.inject:javax.inject:jar:1
 - org.slf4j:slf4j-api:jar:1.7.21
 - commons-beanutils:commons-beanutils:jar:1.8.3
 - javax.servlet:javax.servlet-api:jar:3.1.0
+- org.kill-bill.billing:killbill-platform-osgi:jar:0.30
 - io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
-- org.kill-bill.commons:killbill-locker:jar:0.16
-- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.19
-- org.kill-bill.billing:killbill-util:jar:tests:0.17.0
+- org.kill-bill.commons:killbill-xmlloader:jar:0.18
+- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.18
+- org.kill-bill.commons:killbill-jdbi:jar:0.18
 - org.mockito:mockito-all:jar:1.10.19
-- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.19
+- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.20
+- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.20
+- org.kill-bill.commons:killbill-queue:jar:0.18
 - org.osgi:org.osgi.compendium:jar:5.0.0

data/NEWS

@@ -1,3 +1,9 @@
+8.0.1
+    Fix ActiveRecord dependency issues
+
+8.0.0
+    Initial release for Kill Bill 0.17.x
+
 7.0.5
     Fix regression when loading Rake tasks
 

data/README.md

@@ -5,11 +5,10 @@
 Kill Bill compatibility
 -----------------------
 
-| Plugin Framework version | Kill Bill version |
-| -----------------------: | ----------------: |
-| 7.x.y                    | 0.16.z            |
-| -----------------------: | ----------------: |
-| 8.x.y                    | 0.18.z(and 0.17.x)|
+| Plugin Framework version | Kill Bill version  |
+| -----------------------: | ----------------:  |
+| 7.x.y                    | 0.16.z             |
+| 8.x.y                    | 0.18.z (and 0.17.x)|
 
 
 

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.account.api.Account
 
-        attr_accessor :id, :created_date, :updated_date, :external_key, :currency, :time_zone, :fixed_offset_time_zone, :reference_time, :name, :first_name_length, :email, :bill_cycle_day_local, :payment_method_id, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices
+        attr_accessor :id, :created_date, :updated_date, :external_key, :currency, :time_zone, :parent_account_id, :is_payment_delegated_to_parent, :fixed_offset_time_zone, :reference_time, :name, :first_name_length, :email, :bill_cycle_day_local, :payment_method_id, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices
 
         def initialize()
         end
@@ -66,6 +66,12 @@ module Killbill
             @time_zone = Java::org.joda.time.DateTimeZone.forID((@time_zone.respond_to?(:identifier) ? @time_zone.identifier : @time_zone.to_s))
           end
 
+          # conversion for parent_account_id [type = java.util.UUID]
+          @parent_account_id = java.util.UUID.fromString(@parent_account_id.to_s) unless @parent_account_id.nil?
+
+          # conversion for is_payment_delegated_to_parent [type = java.lang.Boolean]
+          @is_payment_delegated_to_parent = @is_payment_delegated_to_parent.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_payment_delegated_to_parent)
+
           # conversion for fixed_offset_time_zone [type = org.joda.time.DateTimeZone]
           if !@fixed_offset_time_zone.nil?
             @fixed_offset_time_zone = Java::org.joda.time.DateTimeZone.forID((@fixed_offset_time_zone.respond_to?(:identifier) ? @fixed_offset_time_zone.identifier : @fixed_offset_time_zone.to_s))
@@ -161,6 +167,19 @@ module Killbill
             @time_zone = TZInfo::Timezone.get(@time_zone.get_id)
           end
 
+          # conversion for parent_account_id [type = java.util.UUID]
+          @parent_account_id = j_obj.parent_account_id
+          @parent_account_id = @parent_account_id.nil? ? nil : @parent_account_id.to_s
+
+          # conversion for is_payment_delegated_to_parent [type = java.lang.Boolean]
+          @is_payment_delegated_to_parent = j_obj.is_payment_delegated_to_parent
+          if @is_payment_delegated_to_parent.nil?
+            @is_payment_delegated_to_parent = false
+          else
+            tmp_bool = (@is_payment_delegated_to_parent.java_kind_of? java.lang.Boolean) ? @is_payment_delegated_to_parent.boolean_value : @is_payment_delegated_to_parent
+            @is_payment_delegated_to_parent = tmp_bool ? true : false
+          end
+
           # conversion for fixed_offset_time_zone [type = org.joda.time.DateTimeZone]
           @fixed_offset_time_zone = j_obj.fixed_offset_time_zone
           if !@fixed_offset_time_zone.nil?

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.account.api.AccountData
 
-        attr_accessor :external_key, :name, :first_name_length, :email, :bill_cycle_day_local, :currency, :payment_method_id, :time_zone, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices
+        attr_accessor :external_key, :name, :first_name_length, :email, :bill_cycle_day_local, :currency, :payment_method_id, :time_zone, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices, :parent_account_id, :is_payment_delegated_to_parent
 
         def initialize()
         end
@@ -98,6 +98,12 @@ module Killbill
 
           # conversion for is_notified_for_invoices [type = java.lang.Boolean]
           @is_notified_for_invoices = @is_notified_for_invoices.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_notified_for_invoices)
+
+          # conversion for parent_account_id [type = java.util.UUID]
+          @parent_account_id = java.util.UUID.fromString(@parent_account_id.to_s) unless @parent_account_id.nil?
+
+          # conversion for is_payment_delegated_to_parent [type = java.lang.Boolean]
+          @is_payment_delegated_to_parent = @is_payment_delegated_to_parent.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_payment_delegated_to_parent)
           self
         end
 
@@ -175,6 +181,19 @@ module Killbill
             tmp_bool = (@is_notified_for_invoices.java_kind_of? java.lang.Boolean) ? @is_notified_for_invoices.boolean_value : @is_notified_for_invoices
             @is_notified_for_invoices = tmp_bool ? true : false
           end
+
+          # conversion for parent_account_id [type = java.util.UUID]
+          @parent_account_id = j_obj.parent_account_id
+          @parent_account_id = @parent_account_id.nil? ? nil : @parent_account_id.to_s
+
+          # conversion for is_payment_delegated_to_parent [type = java.lang.Boolean]
+          @is_payment_delegated_to_parent = j_obj.is_payment_delegated_to_parent
+          if @is_payment_delegated_to_parent.nil?
+            @is_payment_delegated_to_parent = false
+          else
+            tmp_bool = (@is_payment_delegated_to_parent.java_kind_of? java.lang.Boolean) ? @is_payment_delegated_to_parent.boolean_value : @is_payment_delegated_to_parent
+            @is_payment_delegated_to_parent = tmp_bool ? true : false
+          end
           self
         end
 

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

@@ -206,6 +206,30 @@ module Killbill
           context = context.to_java unless context.nil?
           @real_java_api.remove_email(accountId, email, context)
         end
+
+        java_signature 'Java::java.util.List getChildrenAccounts(Java::java.util.UUID, Java::org.killbill.billing.util.callcontext.TenantContext)'
+        def get_children_accounts(parentAccountId, context)
+
+          # conversion for parentAccountId [type = java.util.UUID]
+          parentAccountId = java.util.UUID.fromString(parentAccountId.to_s) unless parentAccountId.nil?
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.get_children_accounts(parentAccountId, context)
+            # conversion for res [type = java.util.List]
+            tmp = []
+            (res || []).each do |m|
+              # conversion for m [type = org.killbill.billing.account.api.Account]
+              m = Killbill::Plugin::Model::Account.new.to_ruby(m) unless m.nil?
+              tmp << m
+            end
+            res = tmp
+            return res
+          rescue Java::org.killbill.billing.account.api.AccountApiException => e
+            raise Killbill::Plugin::Model::AccountApiException.new.to_ruby(e)
+          end
+        end
       end
     end
   end

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.account.api.ImmutableAccountData
 
-        attr_accessor :id, :external_key, :currency, :time_zone, :fixed_offset_time_zone, :reference_time
+        attr_accessor :id, :external_key, :currency, :time_zone, :parent_account_id, :is_payment_delegated_to_parent, :fixed_offset_time_zone, :reference_time
 
         def initialize()
         end
@@ -54,6 +54,12 @@ module Killbill
             @time_zone = Java::org.joda.time.DateTimeZone.forID((@time_zone.respond_to?(:identifier) ? @time_zone.identifier : @time_zone.to_s))
           end
 
+          # conversion for parent_account_id [type = java.util.UUID]
+          @parent_account_id = java.util.UUID.fromString(@parent_account_id.to_s) unless @parent_account_id.nil?
+
+          # conversion for is_payment_delegated_to_parent [type = java.lang.Boolean]
+          @is_payment_delegated_to_parent = @is_payment_delegated_to_parent.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_payment_delegated_to_parent)
+
           # conversion for fixed_offset_time_zone [type = org.joda.time.DateTimeZone]
           if !@fixed_offset_time_zone.nil?
             @fixed_offset_time_zone = Java::org.joda.time.DateTimeZone.forID((@fixed_offset_time_zone.respond_to?(:identifier) ? @fixed_offset_time_zone.identifier : @fixed_offset_time_zone.to_s))
@@ -85,6 +91,19 @@ module Killbill
             @time_zone = TZInfo::Timezone.get(@time_zone.get_id)
           end
 
+          # conversion for parent_account_id [type = java.util.UUID]
+          @parent_account_id = j_obj.parent_account_id
+          @parent_account_id = @parent_account_id.nil? ? nil : @parent_account_id.to_s
+
+          # conversion for is_payment_delegated_to_parent [type = java.lang.Boolean]
+          @is_payment_delegated_to_parent = j_obj.is_payment_delegated_to_parent
+          if @is_payment_delegated_to_parent.nil?
+            @is_payment_delegated_to_parent = false
+          else
+            tmp_bool = (@is_payment_delegated_to_parent.java_kind_of? java.lang.Boolean) ? @is_payment_delegated_to_parent.boolean_value : @is_payment_delegated_to_parent
+            @is_payment_delegated_to_parent = tmp_bool ? true : false
+          end
+
           # conversion for fixed_offset_time_zone [type = org.joda.time.DateTimeZone]
           @fixed_offset_time_zone = j_obj.fixed_offset_time_zone
           if !@fixed_offset_time_zone.nil?

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.invoice.api.Invoice
 
-        attr_accessor :id, :created_date, :updated_date, :invoice_items, :number_of_items, :payments, :number_of_payments, :account_id, :invoice_number, :invoice_date, :target_date, :currency, :paid_amount, :original_charged_amount, :charged_amount, :credited_amount, :refunded_amount, :balance, :is_migration_invoice
+        attr_accessor :id, :created_date, :updated_date, :invoice_items, :number_of_items, :payments, :number_of_payments, :account_id, :invoice_number, :invoice_date, :target_date, :currency, :paid_amount, :original_charged_amount, :charged_amount, :credited_amount, :refunded_amount, :balance, :is_migration_invoice, :status, :is_parent_invoice
 
         def initialize()
         end
@@ -142,6 +142,12 @@ module Killbill
 
           # conversion for is_migration_invoice [type = boolean]
           @is_migration_invoice = @is_migration_invoice.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_migration_invoice)
+
+          # conversion for status [type = org.killbill.billing.invoice.api.InvoiceStatus]
+          @status = Java::org.killbill.billing.invoice.api.InvoiceStatus.value_of( @status.to_s ) unless @status.nil?
+
+          # conversion for is_parent_invoice [type = boolean]
+          @is_parent_invoice = @is_parent_invoice.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_parent_invoice)
           self
         end
 
@@ -247,6 +253,19 @@ module Killbill
             tmp_bool = (@is_migration_invoice.java_kind_of? java.lang.Boolean) ? @is_migration_invoice.boolean_value : @is_migration_invoice
             @is_migration_invoice = tmp_bool ? true : false
           end
+
+          # conversion for status [type = org.killbill.billing.invoice.api.InvoiceStatus]
+          @status = j_obj.status
+          @status = @status.to_s.to_sym unless @status.nil?
+
+          # conversion for is_parent_invoice [type = boolean]
+          @is_parent_invoice = j_obj.is_parent_invoice
+          if @is_parent_invoice.nil?
+            @is_parent_invoice = false
+          else
+            tmp_bool = (@is_parent_invoice.java_kind_of? java.lang.Boolean) ? @is_parent_invoice.boolean_value : @is_parent_invoice
+            @is_parent_invoice = tmp_bool ? true : false
+          end
           self
         end
 

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.invoice.api.formatters.InvoiceFormatter
 
-        attr_accessor :invoice_items, :number_of_items, :payments, :number_of_payments, :account_id, :invoice_number, :invoice_date, :target_date, :currency, :paid_amount, :original_charged_amount, :charged_amount, :credited_amount, :refunded_amount, :balance, :is_migration_invoice, :id, :created_date, :updated_date, :formatted_invoice_date, :formatted_charged_amount, :formatted_paid_amount, :formatted_balance, :processed_currency, :processed_payment_rate
+        attr_accessor :invoice_items, :number_of_items, :payments, :number_of_payments, :account_id, :invoice_number, :invoice_date, :target_date, :currency, :paid_amount, :original_charged_amount, :charged_amount, :credited_amount, :refunded_amount, :balance, :is_migration_invoice, :status, :is_parent_invoice, :id, :created_date, :updated_date, :formatted_invoice_date, :formatted_charged_amount, :formatted_paid_amount, :formatted_balance, :processed_currency, :processed_payment_rate
 
         def initialize()
         end
@@ -128,6 +128,12 @@ module Killbill
           # conversion for is_migration_invoice [type = boolean]
           @is_migration_invoice = @is_migration_invoice.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_migration_invoice)
 
+          # conversion for status [type = org.killbill.billing.invoice.api.InvoiceStatus]
+          @status = Java::org.killbill.billing.invoice.api.InvoiceStatus.value_of( @status.to_s ) unless @status.nil?
+
+          # conversion for is_parent_invoice [type = boolean]
+          @is_parent_invoice = @is_parent_invoice.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_parent_invoice)
+
           # conversion for id [type = java.util.UUID]
           @id = java.util.UUID.fromString(@id.to_s) unless @id.nil?
 
@@ -246,6 +252,19 @@ module Killbill
             @is_migration_invoice = tmp_bool ? true : false
           end
 
+          # conversion for status [type = org.killbill.billing.invoice.api.InvoiceStatus]
+          @status = j_obj.status
+          @status = @status.to_s.to_sym unless @status.nil?
+
+          # conversion for is_parent_invoice [type = boolean]
+          @is_parent_invoice = j_obj.is_parent_invoice
+          if @is_parent_invoice.nil?
+            @is_parent_invoice = false
+          else
+            tmp_bool = (@is_parent_invoice.java_kind_of? java.lang.Boolean) ? @is_parent_invoice.boolean_value : @is_parent_invoice
+            @is_parent_invoice = tmp_bool ? true : false
+          end
+
           # conversion for id [type = java.util.UUID]
           @id = j_obj.id
           @id = @id.nil? ? nil : @id.to_s

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, :start_date, :end_date, :amount, :currency, :description, :bundle_id, :subscription_id, :plan_name, :phase_name, :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, :phase_name, :usage_name, :rate, :linked_item_id
 
         def initialize()
         end
@@ -64,6 +64,9 @@ module Killbill
           # conversion for account_id [type = java.util.UUID]
           @account_id = java.util.UUID.fromString(@account_id.to_s) unless @account_id.nil?
 
+          # conversion for child_account_id [type = java.util.UUID]
+          @child_account_id = java.util.UUID.fromString(@child_account_id.to_s) unless @child_account_id.nil?
+
           # conversion for start_date [type = org.joda.time.LocalDate]
           if !@start_date.nil?
             @start_date = Java::org.joda.time.LocalDate.parse(@start_date.to_s)
@@ -147,6 +150,10 @@ module Killbill
           @account_id = j_obj.account_id
           @account_id = @account_id.nil? ? nil : @account_id.to_s
 
+          # conversion for child_account_id [type = java.util.UUID]
+          @child_account_id = j_obj.child_account_id
+          @child_account_id = @child_account_id.nil? ? nil : @child_account_id.to_s
+
           # conversion for start_date [type = org.joda.time.LocalDate]
           @start_date = j_obj.start_date
           if !@start_date.nil?

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, :start_date, :end_date, :amount, :currency, :description, :bundle_id, :subscription_id, :plan_name, :phase_name, :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, :phase_name, :usage_name, :rate, :linked_item_id, :id, :created_date, :updated_date, :formatted_start_date, :formatted_end_date, :formatted_amount
 
         def initialize()
         end
@@ -49,6 +49,9 @@ module Killbill
           # conversion for account_id [type = java.util.UUID]
           @account_id = java.util.UUID.fromString(@account_id.to_s) unless @account_id.nil?
 
+          # conversion for child_account_id [type = java.util.UUID]
+          @child_account_id = java.util.UUID.fromString(@child_account_id.to_s) unless @child_account_id.nil?
+
           # conversion for start_date [type = org.joda.time.LocalDate]
           if !@start_date.nil?
             @start_date = Java::org.joda.time.LocalDate.parse(@start_date.to_s)
@@ -136,6 +139,10 @@ module Killbill
           @account_id = j_obj.account_id
           @account_id = @account_id.nil? ? nil : @account_id.to_s
 
+          # conversion for child_account_id [type = java.util.UUID]
+          @child_account_id = j_obj.child_account_id
+          @child_account_id = @child_account_id.nil? ? nil : @child_account_id.to_s
+
           # conversion for start_date [type = org.joda.time.LocalDate]
           @start_date = j_obj.start_date
           if !@start_date.nil?

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

@@ -0,0 +1,107 @@
+#############################################################################################
+#                                                                                           #
+#                   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.api'
+      class InvoiceParentChild
+
+        include org.killbill.billing.invoice.api.InvoiceParentChild
+
+        attr_accessor :id, :created_date, :updated_date, :parent_invoice_id, :child_invoice_id, :child_account_id
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for id [type = java.util.UUID]
+          @id = java.util.UUID.fromString(@id.to_s) unless @id.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 parent_invoice_id [type = java.util.UUID]
+          @parent_invoice_id = java.util.UUID.fromString(@parent_invoice_id.to_s) unless @parent_invoice_id.nil?
+
+          # conversion for child_invoice_id [type = java.util.UUID]
+          @child_invoice_id = java.util.UUID.fromString(@child_invoice_id.to_s) unless @child_invoice_id.nil?
+
+          # conversion for child_account_id [type = java.util.UUID]
+          @child_account_id = java.util.UUID.fromString(@child_account_id.to_s) unless @child_account_id.nil?
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for id [type = java.util.UUID]
+          @id = j_obj.id
+          @id = @id.nil? ? nil : @id.to_s
+
+          # 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 parent_invoice_id [type = java.util.UUID]
+          @parent_invoice_id = j_obj.parent_invoice_id
+          @parent_invoice_id = @parent_invoice_id.nil? ? nil : @parent_invoice_id.to_s
+
+          # conversion for child_invoice_id [type = java.util.UUID]
+          @child_invoice_id = j_obj.child_invoice_id
+          @child_invoice_id = @child_invoice_id.nil? ? nil : @child_invoice_id.to_s
+
+          # conversion for child_account_id [type = java.util.UUID]
+          @child_account_id = j_obj.child_account_id
+          @child_account_id = @child_account_id.nil? ? nil : @child_account_id.to_s
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -272,8 +272,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::java.util.List insertExternalCharges(Java::java.util.UUID, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def insert_external_charges(accountId, effectiveDate, charges, context)
+        java_signature 'Java::java.util.List insertExternalCharges(Java::java.util.UUID, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::boolean, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def insert_external_charges(accountId, effectiveDate, charges, autoCommit, context)
 
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
@@ -292,10 +292,13 @@ module Killbill
           end
           charges = tmp
 
+          # conversion for autoCommit [type = boolean]
+          autoCommit = autoCommit.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(autoCommit)
+
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.insert_external_charges(accountId, effectiveDate, charges, context)
+            res = @real_java_api.insert_external_charges(accountId, effectiveDate, charges, autoCommit, context)
             # conversion for res [type = java.util.List]
             tmp = []
             (res || []).each do |m|
@@ -328,8 +331,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::java.lang.String, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def insert_credit(accountId, amount, effectiveDate, currency, 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::org.killbill.billing.util.callcontext.CallContext)'
+        def insert_credit(accountId, amount, effectiveDate, currency, autoCommit, description, context)
 
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
@@ -349,13 +352,16 @@ module Killbill
           # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
           currency = Java::org.killbill.billing.catalog.api.Currency.value_of( currency.to_s ) unless currency.nil?
 
+          # conversion for autoCommit [type = boolean]
+          autoCommit = autoCommit.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(autoCommit)
+
           # conversion for description [type = java.lang.String]
           description = description.to_s unless description.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, description, context)
+            res = @real_java_api.insert_credit(accountId, amount, effectiveDate, currency, autoCommit, description, 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
@@ -484,6 +490,17 @@ module Killbill
           @real_java_api.consume_exsting_cba_onaccount_with_unpaid_invoices(accountId, context)
         end
 
+        java_signature 'Java::void commitInvoice(Java::java.util.UUID, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def commit_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.commit_invoice(invoiceId, context)
+        end
+
         java_signature 'Java::java.util.UUID createMigrationInvoice(Java::java.util.UUID, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
         def create_migration_invoice(accountId, invoiceDate, items, context)
 
@@ -511,6 +528,17 @@ module Killbill
           res = res.nil? ? nil : res.to_s
           return res
         end
+
+        java_signature 'Java::void transferChildCreditToParent(Java::java.util.UUID, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def transfer_child_credit_to_parent(childAccountId, context)
+
+          # conversion for childAccountId [type = java.util.UUID]
+          childAccountId = java.util.UUID.fromString(childAccountId.to_s) unless childAccountId.nil?
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          @real_java_api.transfer_child_credit_to_parent(childAccountId, context)
+        end
       end
     end
   end

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.catalog.api.MigrationPlan
 
-        attr_accessor :initial_phases, :product, :price_list, :name, :initial_phase_iterator, :final_phase, :recurring_billing_period, :plans_allowed_in_bundle, :all_phases, :effective_date_for_existing_subscriptions
+        attr_accessor :initial_phases, :product, :price_list_name, :name, :initial_phase_iterator, :final_phase, :recurring_billing_period, :plans_allowed_in_bundle, :all_phases, :effective_date_for_existing_subscriptions
 
         def initialize()
         end
@@ -52,8 +52,8 @@ module Killbill
           # conversion for product [type = org.killbill.billing.catalog.api.Product]
           @product = @product.to_java unless @product.nil?
 
-          # conversion for price_list [type = org.killbill.billing.catalog.api.PriceList]
-          @price_list = @price_list.to_java unless @price_list.nil?
+          # conversion for price_list_name [type = java.lang.String]
+          @price_list_name = @price_list_name.to_s unless @price_list_name.nil?
 
           # conversion for name [type = java.lang.String]
           @name = @name.to_s unless @name.nil?
@@ -103,9 +103,8 @@ module Killbill
           @product = j_obj.product
           @product = Killbill::Plugin::Model::Product.new.to_ruby(@product) unless @product.nil?
 
-          # conversion for price_list [type = org.killbill.billing.catalog.api.PriceList]
-          @price_list = j_obj.price_list
-          @price_list = Killbill::Plugin::Model::PriceList.new.to_ruby(@price_list) unless @price_list.nil?
+          # conversion for price_list_name [type = java.lang.String]
+          @price_list_name = j_obj.price_list_name
 
           # conversion for name [type = java.lang.String]
           @name = j_obj.name

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.account.api.MutableAccountData
 
-        attr_accessor :external_key, :name, :first_name_length, :email, :bill_cycle_day_local, :currency, :payment_method_id, :time_zone, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices
+        attr_accessor :external_key, :name, :first_name_length, :email, :bill_cycle_day_local, :currency, :payment_method_id, :time_zone, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices, :parent_account_id, :is_payment_delegated_to_parent
 
         def initialize()
         end
@@ -98,6 +98,12 @@ module Killbill
 
           # conversion for is_notified_for_invoices [type = java.lang.Boolean]
           @is_notified_for_invoices = @is_notified_for_invoices.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_notified_for_invoices)
+
+          # conversion for parent_account_id [type = java.util.UUID]
+          @parent_account_id = java.util.UUID.fromString(@parent_account_id.to_s) unless @parent_account_id.nil?
+
+          # conversion for is_payment_delegated_to_parent [type = java.lang.Boolean]
+          @is_payment_delegated_to_parent = @is_payment_delegated_to_parent.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_payment_delegated_to_parent)
           self
         end
 
@@ -175,6 +181,19 @@ module Killbill
             tmp_bool = (@is_notified_for_invoices.java_kind_of? java.lang.Boolean) ? @is_notified_for_invoices.boolean_value : @is_notified_for_invoices
             @is_notified_for_invoices = tmp_bool ? true : false
           end
+
+          # conversion for parent_account_id [type = java.util.UUID]
+          @parent_account_id = j_obj.parent_account_id
+          @parent_account_id = @parent_account_id.nil? ? nil : @parent_account_id.to_s
+
+          # conversion for is_payment_delegated_to_parent [type = java.lang.Boolean]
+          @is_payment_delegated_to_parent = j_obj.is_payment_delegated_to_parent
+          if @is_payment_delegated_to_parent.nil?
+            @is_payment_delegated_to_parent = false
+          else
+            tmp_bool = (@is_payment_delegated_to_parent.java_kind_of? java.lang.Boolean) ? @is_payment_delegated_to_parent.boolean_value : @is_payment_delegated_to_parent
+            @is_payment_delegated_to_parent = tmp_bool ? true : false
+          end
           self
         end
 

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.catalog.api.Plan
 
-        attr_accessor :initial_phases, :product, :price_list, :name, :initial_phase_iterator, :final_phase, :recurring_billing_period, :plans_allowed_in_bundle, :all_phases, :effective_date_for_existing_subscriptions
+        attr_accessor :initial_phases, :product, :price_list_name, :name, :initial_phase_iterator, :final_phase, :recurring_billing_period, :plans_allowed_in_bundle, :all_phases, :effective_date_for_existing_subscriptions
 
         def initialize()
         end
@@ -52,8 +52,8 @@ module Killbill
           # conversion for product [type = org.killbill.billing.catalog.api.Product]
           @product = @product.to_java unless @product.nil?
 
-          # conversion for price_list [type = org.killbill.billing.catalog.api.PriceList]
-          @price_list = @price_list.to_java unless @price_list.nil?
+          # conversion for price_list_name [type = java.lang.String]
+          @price_list_name = @price_list_name.to_s unless @price_list_name.nil?
 
           # conversion for name [type = java.lang.String]
           @name = @name.to_s unless @name.nil?
@@ -103,9 +103,8 @@ module Killbill
           @product = j_obj.product
           @product = Killbill::Plugin::Model::Product.new.to_ruby(@product) unless @product.nil?
 
-          # conversion for price_list [type = org.killbill.billing.catalog.api.PriceList]
-          @price_list = j_obj.price_list
-          @price_list = Killbill::Plugin::Model::PriceList.new.to_ruby(@price_list) unless @price_list.nil?
+          # conversion for price_list_name [type = java.lang.String]
+          @price_list_name = j_obj.price_list_name
 
           # conversion for name [type = java.lang.String]
           @name = j_obj.name

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

@@ -98,6 +98,7 @@ require 'killbill/gen/api/invoice'
 require 'killbill/gen/api/invoice_api_exception'
 require 'killbill/gen/api/invoice_creation_event'
 require 'killbill/gen/api/invoice_item'
+require 'killbill/gen/api/invoice_parent_child'
 require 'killbill/gen/api/invoice_payment'
 require 'killbill/gen/api/invoice_payment_api'
 require 'killbill/gen/api/invoice_user_api'

data/lib/killbill/version.rb

@@ -1,3 +1,3 @@
 module Killbill
-  VERSION = '8.0.1'
+  VERSION = '8.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.1.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -412,6 +412,7 @@ files:
 - lib/killbill/gen/api/invoice_formatter.rb
 - lib/killbill/gen/api/invoice_item.rb
 - lib/killbill/gen/api/invoice_item_formatter.rb
+- lib/killbill/gen/api/invoice_parent_child.rb
 - lib/killbill/gen/api/invoice_payment.rb
 - lib/killbill/gen/api/invoice_payment_api.rb
 - lib/killbill/gen/api/invoice_user_api.rb