killbill 9.3.2 → 9.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b93f3f16c26b97554483a2114fa0b6b41b45d186
-  data.tar.gz: 5999eae2ad1cd1c7b9847068e6c825837ee97a12
+  metadata.gz: 9a5f16eb8d2d7d84e106cd72a7641f4c5df8e1c1
+  data.tar.gz: 808645deb5a84812d8cdd31e3333d07c25288d83
 SHA512:
-  metadata.gz: b0b456d725c828d265c5504b3f3a3d0d4bd645d6c5fe3fc350830d6b1ff52b71e10e45dd74112cda39a1b96a7b455e284c45ff5a46ef7af30e5a6b1f94d8f972
-  data.tar.gz: fe0dcbb907753676bd675eac4ac69e9b8531958f58a4ab6b44d9012e0b3f94ca8156938071d1cd3169a7a152dc37eb34412f9dfaf9f3252cf9e47a814e1446eb
+  metadata.gz: 984159049756726d30838852e556628bf8357b3700ac176dd19aece003f79e625778cf5a326ab08f0fd04463f249fe672619173685fa662d67d4a7e0d8020e88
+  data.tar.gz: 268ee0eb07937c1cd1664d23daf43bd43591fa280c1e64db6c40504eaf869f8890a088578517e8cc02aeeecc48e2c7498d2df06ebef10b58bbf48f86717a4bcc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill (9.3.2)
+    killbill (9.4.0)
       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.25'
+jar 'org.kill-bill.billing:killbill-api', '0.51.27'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.24.8'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.24.8'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.24.8'
@@ -6,7 +6,7 @@ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.24.8'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.24.8'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.24.8'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.24.8'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.19.16'
-jar 'org.kill-bill.billing:killbill-util', '0.19.16'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.19.18'
+jar 'org.kill-bill.billing:killbill-util', '0.19.18'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/Jarfile.lock

@@ -1,35 +1,37 @@
 ---
 :runtime:
+- org.kill-bill.commons:killbill-clock:jar:0.21.15
 - com.zaxxer:HikariCP-java6:jar:2.3.13
 - net.jcip:jcip-annotations:jar:1.0
+- org.kill-bill.billing:killbill-api:jar:0.51.27
 - 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.commons:killbill-locker:jar:0.21.13
 - aopalliance:aopalliance:jar:1.0
 - org.osgi:org.osgi.core:jar:5.0.0
 - com.ning:async-http-client:jar:1.9.40
+- org.kill-bill.billing:killbill-platform-osgi:jar:0.37.19
+- org.kill-bill.billing:killbill-internal-api:jar:0.19.18
 - org.joda:joda-money:jar:0.9
 - org.ehcache.integrations.shiro:shiro-ehcache3:jar:1.0.0
+- org.kill-bill.commons:killbill-concurrent:jar:0.21.15
+- org.kill-bill.billing:killbill-util:jar:0.19.18
 - com.fasterxml.jackson.dataformat:jackson-dataformat-smile:jar:2.6.7
-- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.21.13
 - com.fasterxml:classmate:jar:1.1.0
 - org.slf4j:jcl-over-slf4j:jar:1.7.25
-- org.kill-bill.commons:killbill-queue:jar:0.21.13
-- org.kill-bill.commons:killbill-xmlloader:jar:0.21.13
+- org.jasypt:jasypt:jar:1.9.2
 - com.google.inject:guice:jar:3.0
+- org.kill-bill.billing:killbill-platform-api:jar:0.37.19
 - io.netty:netty:jar:3.10.6.Final
-- org.kill-bill.commons:killbill-jdbi:jar:0.21.13
 - org.apache.felix:org.apache.felix.framework:jar:4.4.1
 - org.ehcache:ehcache-clustered:jar:3.3.1
+- org.kill-bill.billing:killbill-util:jar:tests:0.19.18
 - com.google.code.findbugs:jsr305:jar:3.0.1
-- org.kill-bill.billing:killbill-internal-api:jar:0.19.16
 - com.google.guava:guava:jar:20.0
 - com.samskivert:jmustache:jar:1.5
-- org.kill-bill.billing:killbill-platform-base:jar:0.37.14
+- org.kill-bill.billing:killbill-platform-lifecycle:jar:0.37.19
 - org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.24.8
 - org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.24.8
-- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.37.14
 - javax.cache:cache-api:jar:1.0.0
 - org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
 - com.fasterxml.jackson.core:jackson-annotations:jar:2.6.7
@@ -37,34 +39,33 @@
 - org.ow2.asm:asm:jar:5.0.3
 - com.fasterxml.jackson.core:jackson-databind:jar:2.6.7
 - com.google.code.findbugs:annotations:jar:3.0.1u2
-- org.kill-bill.billing:killbill-api:jar:0.51.25
 - org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.24.8
 - org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.24.8
-- org.kill-bill.commons:killbill-concurrent:jar:0.21.13
-- org.kill-bill.billing:killbill-util:jar:0.19.16
-- org.kill-bill.billing:killbill-platform-osgi:jar:0.37.14
 - org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.24.8
 - org.antlr:ST4:jar:4.0.8
 - org.apache.shiro:shiro-guice:jar:1.3.2
 - org.antlr:antlr-runtime:jar:3.5.2
+- org.kill-bill.commons:killbill-locker:jar:0.21.15
 - org.ehcache:ehcache:jar:3.3.1
-- org.kill-bill.billing:killbill-platform-api:jar:0.37.14
 - io.dropwizard.metrics:metrics-jcache:jar:3.2.2
 - com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.6.7
 - com.google.inject.extensions:guice-multibindings:jar:3.0
 - joda-time:joda-time:jar:2.9.9
 - javax.inject:javax.inject:jar:1
-- org.kill-bill.billing:killbill-util:jar:tests:0.19.16
 - com.h2database:h2:jar:1.4.194
 - commons-beanutils:commons-beanutils:jar:1.8.3
 - javax.servlet:javax.servlet-api:jar:3.1.0
 - com.fasterxml.jackson.core:jackson-core:jar:2.6.7
+- org.kill-bill.commons:killbill-jdbi:jar:0.21.15
 - cglib:cglib:jar:3.1
 - io.dropwizard.metrics:metrics-core:jar:3.2.2
-- org.kill-bill.billing:killbill-platform-lifecycle:jar:0.37.14
+- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.21.15
+- org.kill-bill.billing:killbill-platform-base:jar:0.37.19
+- org.kill-bill.commons:killbill-queue:jar:0.21.15
 - org.slf4j:slf4j-api:jar:1.7.25
+- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.37.19
+- org.kill-bill.commons:killbill-xmlloader:jar:0.21.15
 - org.mockito:mockito-all:jar:1.10.19
 - org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.24.8
 - org.osgi:org.osgi.compendium:jar:5.0.0
 - org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.24.8
-- org.kill-bill.commons:killbill-clock:jar:0.21.13

data/NEWS

@@ -1,3 +1,6 @@
+9.4.0
+    Update to Kill Bill 0.19.18 APIs
+
 9.3.2
     Update to Kill Bill 0.19.17 APIs
 

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, :parent_account_id, :is_payment_delegated_to_parent, :notes
+        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, :parent_account_id, :is_payment_delegated_to_parent, :notes
 
         def initialize()
         end
@@ -122,9 +122,6 @@ module Killbill
           # conversion for is_migrated [type = java.lang.Boolean]
           @is_migrated = @is_migrated.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_migrated)
 
-          # 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?
 
@@ -236,15 +233,6 @@ module Killbill
             @is_migrated = tmp_bool ? true : false
           end
 
-          # conversion for is_notified_for_invoices [type = java.lang.Boolean]
-          @is_notified_for_invoices = j_obj.is_notified_for_invoices
-          if @is_notified_for_invoices.nil?
-            @is_notified_for_invoices = false
-          else
-            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

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, :reference_time, :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, :notes
+        attr_accessor :external_key, :name, :first_name_length, :email, :bill_cycle_day_local, :currency, :payment_method_id, :reference_time, :time_zone, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :parent_account_id, :is_payment_delegated_to_parent, :notes
 
         def initialize()
         end
@@ -102,9 +102,6 @@ module Killbill
           # conversion for is_migrated [type = java.lang.Boolean]
           @is_migrated = @is_migrated.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_migrated)
 
-          # 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?
 
@@ -190,15 +187,6 @@ module Killbill
             @is_migrated = tmp_bool ? true : false
           end
 
-          # conversion for is_notified_for_invoices [type = java.lang.Boolean]
-          @is_notified_for_invoices = j_obj.is_notified_for_invoices
-          if @is_notified_for_invoices.nil?
-            @is_notified_for_invoices = false
-          else
-            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

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

@@ -39,18 +39,24 @@ module Killbill
         end
 
 
-        java_signature 'Java::org.killbill.billing.catalog.api.Catalog getCatalog(Java::java.lang.String, Java::org.killbill.billing.util.callcontext.TenantContext)'
-        def get_catalog(catalogName, context)
+        java_signature 'Java::org.killbill.billing.catalog.api.VersionedCatalog getCatalog(Java::java.lang.String, Java::org.joda.time.DateTime, Java::org.killbill.billing.util.callcontext.TenantContext)'
+        def get_catalog(catalogName, catalogDateVersion, context)
 
           # conversion for catalogName [type = java.lang.String]
           catalogName = catalogName.to_s unless catalogName.nil?
 
+          # conversion for catalogDateVersion [type = org.joda.time.DateTime]
+          if !catalogDateVersion.nil?
+            catalogDateVersion =  (catalogDateVersion.kind_of? Time) ? DateTime.parse(catalogDateVersion.to_s) : catalogDateVersion
+            catalogDateVersion = Java::org.joda.time.DateTime.new(catalogDateVersion.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          end
+
           # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.get_catalog(catalogName, context)
-            # conversion for res [type = org.killbill.billing.catalog.api.Catalog]
-            res = Killbill::Plugin::Model::Catalog.new.to_ruby(res) unless res.nil?
+            res = @real_java_api.get_catalog(catalogName, catalogDateVersion, context)
+            # conversion for res [type = org.killbill.billing.catalog.api.VersionedCatalog]
+            res = Killbill::Plugin::Model::VersionedCatalog.new.to_ruby(res) unless res.nil?
             return res
           rescue Java::org.killbill.billing.catalog.api.CatalogApiException => e
             raise Killbill::Plugin::Model::CatalogApiException.new.to_ruby(e)

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

@@ -233,6 +233,100 @@ module Killbill
   end
 end
 
+java_signature 'Java::org.killbill.billing.invoice.api.InvoicePayment createChargebackForInvoicePayment(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::org.joda.time.DateTime, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
+def create_chargeback_for_invoice_payment(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, properties, paymentOptions, context)
+
+  # conversion for account [type = org.killbill.billing.account.api.Account]
+  account = account.to_java unless account.nil?
+
+  # conversion for paymentId [type = java.util.UUID]
+  paymentId = java.util.UUID.fromString(paymentId.to_s) unless paymentId.nil?
+
+  # conversion for amount [type = java.math.BigDecimal]
+  if amount.nil?
+    amount = java.math.BigDecimal::ZERO
+  else
+    amount = java.math.BigDecimal.new(amount.to_s)
+  end
+
+  # 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 effectiveDate [type = org.joda.time.DateTime]
+  if !effectiveDate.nil?
+    effectiveDate =  (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
+    effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
+  end
+
+  # conversion for paymentTransactionExternalKey [type = java.lang.String]
+  paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
+
+  # conversion for properties [type = java.lang.Iterable]
+  tmp = java.util.ArrayList.new
+  (properties || []).each do |m|
+    # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
+    m = m.to_java unless m.nil?
+    tmp.add(m)
+  end
+  properties = tmp
+
+  # conversion for paymentOptions [type = org.killbill.billing.payment.api.PaymentOptions]
+  paymentOptions = paymentOptions.to_java unless paymentOptions.nil?
+
+  # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
+  context = context.to_java unless context.nil?
+  begin
+    res = @real_java_api.create_chargeback_for_invoice_payment(account, paymentId, amount, currency, effectiveDate, paymentTransactionExternalKey, properties, paymentOptions, context)
+    # conversion for res [type = org.killbill.billing.invoice.api.InvoicePayment]
+    res = Killbill::Plugin::Model::InvoicePayment.new.to_ruby(res) unless res.nil?
+    return res
+  rescue Java::org.killbill.billing.payment.api.PaymentApiException => e
+    raise Killbill::Plugin::Model::PaymentApiException.new.to_ruby(e)
+  end
+end
+
+java_signature 'Java::org.killbill.billing.invoice.api.InvoicePayment createChargebackReversalForInvoicePayment(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::org.joda.time.DateTime, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
+def create_chargeback_reversal_for_invoice_payment(account, paymentId, effectiveDate, paymentTransactionExternalKey, properties, paymentOptions, context)
+
+  # conversion for account [type = org.killbill.billing.account.api.Account]
+  account = account.to_java unless account.nil?
+
+  # conversion for paymentId [type = java.util.UUID]
+  paymentId = java.util.UUID.fromString(paymentId.to_s) unless paymentId.nil?
+
+  # conversion for effectiveDate [type = org.joda.time.DateTime]
+  if !effectiveDate.nil?
+    effectiveDate =  (effectiveDate.kind_of? Time) ? DateTime.parse(effectiveDate.to_s) : effectiveDate
+    effectiveDate = Java::org.joda.time.DateTime.new(effectiveDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
+  end
+
+  # conversion for paymentTransactionExternalKey [type = java.lang.String]
+  paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
+
+  # conversion for properties [type = java.lang.Iterable]
+  tmp = java.util.ArrayList.new
+  (properties || []).each do |m|
+    # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
+    m = m.to_java unless m.nil?
+    tmp.add(m)
+  end
+  properties = tmp
+
+  # conversion for paymentOptions [type = org.killbill.billing.payment.api.PaymentOptions]
+  paymentOptions = paymentOptions.to_java unless paymentOptions.nil?
+
+  # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
+  context = context.to_java unless context.nil?
+  begin
+    res = @real_java_api.create_chargeback_reversal_for_invoice_payment(account, paymentId, effectiveDate, paymentTransactionExternalKey, properties, paymentOptions, context)
+    # conversion for res [type = org.killbill.billing.invoice.api.InvoicePayment]
+    res = Killbill::Plugin::Model::InvoicePayment.new.to_ruby(res) unless res.nil?
+    return res
+  rescue Java::org.killbill.billing.payment.api.PaymentApiException => e
+    raise Killbill::Plugin::Model::PaymentApiException.new.to_ruby(e)
+  end
+end
+
 java_signature 'Java::java.util.List getInvoicePayments(Java::java.util.UUID, Java::org.killbill.billing.util.callcontext.TenantContext)'
 def get_invoice_payments(paymentId, context)
 

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

@@ -34,12 +34,15 @@ module Killbill
 
         include org.killbill.billing.catalog.api.MigrationPlan
 
-        attr_accessor :recurring_billing_mode, :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, :name, :pretty_name
+        attr_accessor :catalog, :recurring_billing_mode, :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, :name, :pretty_name
 
         def initialize()
         end
 
         def to_java()
+          # conversion for catalog [type = org.killbill.billing.catalog.api.StaticCatalog]
+          @catalog = @catalog.to_java unless @catalog.nil?
+
           # conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
           @recurring_billing_mode = Java::org.killbill.billing.catalog.api.BillingMode.value_of( @recurring_billing_mode.to_s ) unless @recurring_billing_mode.nil?
 
@@ -95,6 +98,10 @@ module Killbill
         end
 
         def to_ruby(j_obj)
+          # conversion for catalog [type = org.killbill.billing.catalog.api.StaticCatalog]
+          @catalog = j_obj.catalog
+          @catalog = Killbill::Plugin::Model::StaticCatalog.new.to_ruby(@catalog) unless @catalog.nil?
+
           # conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
           @recurring_billing_mode = j_obj.recurring_billing_mode
           @recurring_billing_mode = @recurring_billing_mode.to_s.to_sym unless @recurring_billing_mode.nil?

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, :reference_time, :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, :notes
+        attr_accessor :external_key, :name, :first_name_length, :email, :bill_cycle_day_local, :currency, :payment_method_id, :reference_time, :time_zone, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :parent_account_id, :is_payment_delegated_to_parent, :notes
 
         def initialize()
         end
@@ -102,9 +102,6 @@ module Killbill
           # conversion for is_migrated [type = java.lang.Boolean]
           @is_migrated = @is_migrated.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_migrated)
 
-          # 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?
 
@@ -190,15 +187,6 @@ module Killbill
             @is_migrated = tmp_bool ? true : false
           end
 
-          # conversion for is_notified_for_invoices [type = java.lang.Boolean]
-          @is_notified_for_invoices = j_obj.is_notified_for_invoices
-          if @is_notified_for_invoices.nil?
-            @is_notified_for_invoices = false
-          else
-            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

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.catalog.api.Plan
 
-        attr_accessor :name, :pretty_name, :recurring_billing_mode, :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 :name, :pretty_name, :catalog, :recurring_billing_mode, :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
 
         def initialize()
         end
@@ -46,6 +46,9 @@ module Killbill
           # conversion for pretty_name [type = java.lang.String]
           @pretty_name = @pretty_name.to_s unless @pretty_name.nil?
 
+          # conversion for catalog [type = org.killbill.billing.catalog.api.StaticCatalog]
+          @catalog = @catalog.to_java unless @catalog.nil?
+
           # conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
           @recurring_billing_mode = Java::org.killbill.billing.catalog.api.BillingMode.value_of( @recurring_billing_mode.to_s ) unless @recurring_billing_mode.nil?
 
@@ -101,6 +104,10 @@ module Killbill
           # conversion for pretty_name [type = java.lang.String]
           @pretty_name = j_obj.pretty_name
 
+          # conversion for catalog [type = org.killbill.billing.catalog.api.StaticCatalog]
+          @catalog = j_obj.catalog
+          @catalog = Killbill::Plugin::Model::StaticCatalog.new.to_ruby(@catalog) unless @catalog.nil?
+
           # conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
           @recurring_billing_mode = j_obj.recurring_billing_mode
           @recurring_billing_mode = @recurring_billing_mode.to_s.to_sym unless @recurring_billing_mode.nil?

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

@@ -81,6 +81,7 @@ require 'killbill/gen/api/tier_price_override'
 require 'killbill/gen/api/unit'
 require 'killbill/gen/api/usage'
 require 'killbill/gen/api/usage_price_override'
+require 'killbill/gen/api/versioned_catalog'
 require 'killbill/gen/api/currency_conversion'
 require 'killbill/gen/api/currency_conversion_api'
 require 'killbill/gen/api/currency_conversion_exception'

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

@@ -0,0 +1,185 @@
+#############################################################################################
+#                                                                                           #
+#                   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.catalog.api'
+      class VersionedCatalog
+
+        include org.killbill.billing.catalog.api.VersionedCatalog
+
+        attr_accessor :catalog_name, :effective_date, :current_supported_currencies, :current_products, :current_units, :current_plans, :available_base_plan_listings, :versions
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for catalog_name [type = java.lang.String]
+          @catalog_name = @catalog_name.to_s unless @catalog_name.nil?
+
+          # conversion for effective_date [type = java.util.Date]
+          if !@effective_date.nil?
+            @effective_date =  (@effective_date.kind_of? Time) ? DateTime.parse(@effective_date.to_s) : @effective_date
+            @effective_date = Java::org.joda.time.DateTime.new(@effective_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
+            @effective_date = @effective_date.to_date
+          end
+
+          # conversion for current_supported_currencies [type = org.killbill.billing.catalog.api.Currency[]]
+          tmp = []
+          (@current_supported_currencies || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Currency]
+            m = Java::org.killbill.billing.catalog.api.Currency.value_of( m.to_s ) unless m.nil?
+            tmp << m
+          end
+          @current_supported_currencies = tmp.to_java Java::org.killbill.billing.catalog.api.Currency
+
+          # conversion for current_products [type = java.util.Collection]
+          tmp = java.util.ArrayList.new
+          (@current_products || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Product]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @current_products = tmp
+
+          # conversion for current_units [type = org.killbill.billing.catalog.api.Unit[]]
+          tmp = []
+          (@current_units || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Unit]
+            m = m.to_java unless m.nil?
+            tmp << m
+          end
+          @current_units = tmp.to_java Java::org.killbill.billing.catalog.api.Unit
+
+          # conversion for current_plans [type = java.util.Collection]
+          tmp = java.util.ArrayList.new
+          (@current_plans || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Plan]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @current_plans = tmp
+
+          # conversion for available_base_plan_listings [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@available_base_plan_listings || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Listing]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @available_base_plan_listings = tmp
+
+          # conversion for versions [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@versions || []).each do |m|
+            # conversion for m [type = Undefined]
+            tmp.add(m)
+          end
+          @versions = tmp
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for catalog_name [type = java.lang.String]
+          @catalog_name = j_obj.catalog_name
+
+          # conversion for effective_date [type = java.util.Date]
+          @effective_date = j_obj.effective_date
+          if !@effective_date.nil?
+            @effective_date = Java::org.joda.time.DateTime.new(@effective_date)
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
+            str = fmt.print(@effective_date)
+            @effective_date = DateTime.iso8601(str)
+          end
+
+          # conversion for current_supported_currencies [type = org.killbill.billing.catalog.api.Currency[]]
+          @current_supported_currencies = j_obj.current_supported_currencies
+          tmp = []
+          (@current_supported_currencies || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Currency]
+            m = m.to_s.to_sym unless m.nil?
+            tmp << m
+          end
+          @current_supported_currencies = tmp
+
+          # conversion for current_products [type = java.util.Collection]
+          @current_products = j_obj.current_products
+          tmp = []
+          (@current_products || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Product]
+            m = Killbill::Plugin::Model::Product.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @current_products = tmp
+
+          # conversion for current_units [type = org.killbill.billing.catalog.api.Unit[]]
+          @current_units = j_obj.current_units
+          tmp = []
+          (@current_units || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Unit]
+            m = Killbill::Plugin::Model::Unit.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @current_units = tmp
+
+          # conversion for current_plans [type = java.util.Collection]
+          @current_plans = j_obj.current_plans
+          tmp = []
+          (@current_plans || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Plan]
+            m = Killbill::Plugin::Model::Plan.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @current_plans = tmp
+
+          # conversion for available_base_plan_listings [type = java.util.List]
+          @available_base_plan_listings = j_obj.available_base_plan_listings
+          tmp = []
+          (@available_base_plan_listings || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Listing]
+            m = Killbill::Plugin::Model::Listing.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @available_base_plan_listings = tmp
+
+          # conversion for versions [type = java.util.List]
+          @versions = j_obj.versions
+          tmp = []
+          (@versions || []).each do |m|
+            # conversion for m [type = Undefined]
+            tmp << m
+          end
+          @versions = tmp
+          self
+        end
+
+      end
+    end
+  end
+end

data/lib/killbill/version.rb

@@ -1,3 +1,3 @@
 module Killbill
-  VERSION = '9.3.2'
+  VERSION = '9.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 9.3.2
+  version: 9.4.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -525,6 +525,7 @@ files:
 - lib/killbill/gen/api/usage_price_override.rb
 - lib/killbill/gen/api/usage_record.rb
 - lib/killbill/gen/api/usage_user_api.rb
+- lib/killbill/gen/api/versioned_catalog.rb
 - lib/killbill/gen/plugin-api/blocking_state_metadata.rb
 - lib/killbill/gen/plugin-api/broadcast_metadata.rb
 - lib/killbill/gen/plugin-api/catalog_plugin_api.rb