killbill 8.2.0 → 8.3.0

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

@@ -86,6 +86,20 @@ module Killbill
           @real_java_api.upload_catalog(catalogXML, context)
         end
 
+        java_signature 'Java::void createDefaultEmptyCatalog(Java::org.joda.time.DateTime, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def create_default_empty_catalog(effectiveDate, callContext)
+
+          # 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 callContext [type = org.killbill.billing.util.callcontext.CallContext]
+          callContext = callContext.to_java unless callContext.nil?
+          @real_java_api.create_default_empty_catalog(effectiveDate, callContext)
+        end
+
         java_signature 'Java::void addSimplePlan(Java::org.killbill.billing.catalog.api.SimplePlanDescriptor, Java::org.joda.time.DateTime, Java::org.killbill.billing.util.callcontext.CallContext)'
         def add_simple_plan(planDescriptor, requestedDate, context)
 

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

@@ -94,36 +94,20 @@ module Killbill
           end
         end
 
-        java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement createBaseEntitlementWithAddOns(Java::java.util.UUID, Java::java.lang.String, Java::java.lang.Iterable, Java::org.joda.time.LocalDate, Java::org.joda.time.LocalDate, Java::boolean, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def create_base_entitlement_with_add_ons(accountId, externalKey, entitlementSpecifier, entitlementEffectiveDate, billingEffectiveDate, isMigrated, properties, context)
+        java_signature 'Java::java.util.List createBaseEntitlementsWithAddOns(Java::java.util.UUID, Java::java.lang.Iterable, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def create_base_entitlements_with_add_ons(accountId, baseEntitlementWithAddOnsSpecifier, properties, context)
 
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
 
-          # conversion for externalKey [type = java.lang.String]
-          externalKey = externalKey.to_s unless externalKey.nil?
-
-          # conversion for entitlementSpecifier [type = java.lang.Iterable]
+          # conversion for baseEntitlementWithAddOnsSpecifier [type = java.lang.Iterable]
           tmp = java.util.ArrayList.new
-          (entitlementSpecifier || []).each do |m|
-            # conversion for m [type = org.killbill.billing.entitlement.api.EntitlementSpecifier]
+          (baseEntitlementWithAddOnsSpecifier || []).each do |m|
+            # conversion for m [type = org.killbill.billing.entitlement.api.BaseEntitlementWithAddOnsSpecifier]
             m = m.to_java unless m.nil?
             tmp.add(m)
           end
-          entitlementSpecifier = tmp
-
-          # conversion for entitlementEffectiveDate [type = org.joda.time.LocalDate]
-          if !entitlementEffectiveDate.nil?
-            entitlementEffectiveDate = Java::org.joda.time.LocalDate.parse(entitlementEffectiveDate.to_s)
-          end
-
-          # conversion for billingEffectiveDate [type = org.joda.time.LocalDate]
-          if !billingEffectiveDate.nil?
-            billingEffectiveDate = Java::org.joda.time.LocalDate.parse(billingEffectiveDate.to_s)
-          end
-
-          # conversion for isMigrated [type = boolean]
-          isMigrated = isMigrated.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(isMigrated)
+          baseEntitlementWithAddOnsSpecifier = tmp
 
           # conversion for properties [type = java.lang.Iterable]
           tmp = java.util.ArrayList.new
@@ -137,9 +121,15 @@ module Killbill
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.create_base_entitlement_with_add_ons(accountId, externalKey, entitlementSpecifier, entitlementEffectiveDate, billingEffectiveDate, isMigrated, properties, context)
-            # conversion for res [type = org.killbill.billing.entitlement.api.Entitlement]
-            res = Killbill::Plugin::Model::Entitlement.new.to_ruby(res) unless res.nil?
+            res = @real_java_api.create_base_entitlements_with_add_ons(accountId, baseEntitlementWithAddOnsSpecifier, properties, context)
+            # conversion for res [type = java.util.List]
+            tmp = []
+            (res || []).each do |m|
+              # conversion for m [type = org.killbill.billing.entitlement.api.Entitlement]
+              m = Killbill::Plugin::Model::Entitlement.new.to_ruby(m) unless m.nil?
+              tmp << m
+            end
+            res = tmp
             return res
           rescue Java::org.killbill.billing.entitlement.api.EntitlementApiException => e
             raise Killbill::Plugin::Model::EntitlementApiException.new.to_ruby(e)

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, :parent_account_id, :is_payment_delegated_to_parent
+        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, :notes
 
         def initialize()
         end
@@ -104,6 +104,9 @@ module Killbill
 
           # 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 notes [type = java.lang.String]
+          @notes = @notes.to_s unless @notes.nil?
           self
         end
 
@@ -194,6 +197,9 @@ module Killbill
             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 notes [type = java.lang.String]
+          @notes = j_obj.notes
           self
         end
 

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

@@ -62,14 +62,14 @@ module Killbill
           end
           @current_supported_currencies = tmp.to_java Java::org.killbill.billing.catalog.api.Currency
 
-          # conversion for current_products [type = org.killbill.billing.catalog.api.Product[]]
-          tmp = []
+          # 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 << m
+            tmp.add(m)
           end
-          @current_products = tmp.to_java Java::org.killbill.billing.catalog.api.Product
+          @current_products = tmp
 
           # conversion for current_units [type = org.killbill.billing.catalog.api.Unit[]]
           tmp = []
@@ -80,14 +80,14 @@ module Killbill
           end
           @current_units = tmp.to_java Java::org.killbill.billing.catalog.api.Unit
 
-          # conversion for current_plans [type = org.killbill.billing.catalog.api.Plan[]]
-          tmp = []
+          # 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 << m
+            tmp.add(m)
           end
-          @current_plans = tmp.to_java Java::org.killbill.billing.catalog.api.Plan
+          @current_plans = tmp
 
           # conversion for available_base_plan_listings [type = java.util.List]
           tmp = java.util.ArrayList.new
@@ -127,7 +127,7 @@ module Killbill
           end
           @current_supported_currencies = tmp
 
-          # conversion for current_products [type = org.killbill.billing.catalog.api.Product[]]
+          # conversion for current_products [type = java.util.Collection]
           @current_products = j_obj.current_products
           tmp = []
           (@current_products || []).each do |m|
@@ -147,7 +147,7 @@ module Killbill
           end
           @current_units = tmp
 
-          # conversion for current_plans [type = org.killbill.billing.catalog.api.Plan[]]
+          # conversion for current_plans [type = java.util.Collection]
           @current_plans = j_obj.current_plans
           tmp = []
           (@current_plans || []).each do |m|

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

@@ -589,6 +589,17 @@ module Killbill
           end
         end
 
+        java_signature 'Java::void cancelScheduledPaymentTransaction(Java::java.lang.String, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def cancel_scheduled_payment_transaction(paymentTransactionExternalKey, context)
+
+          # conversion for paymentTransactionExternalKey [type = java.lang.String]
+          paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          @real_java_api.cancel_scheduled_payment_transaction(paymentTransactionExternalKey, context)
+        end
+
         java_signature 'Java::org.killbill.billing.payment.api.Payment createChargeback(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::org.killbill.billing.util.callcontext.CallContext)'
         def create_chargeback(account, paymentId, amount, currency, paymentTransactionExternalKey, context)
 
@@ -867,6 +878,39 @@ module Killbill
           end
         end
 
+        java_signature 'Java::org.killbill.billing.payment.api.Payment getPaymentByTransactionId(Java::java.util.UUID, Java::boolean, Java::boolean, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.TenantContext)'
+        def get_payment_by_transaction_id(transactionId, withPluginInfo, withAttempts, properties, context)
+
+          # conversion for transactionId [type = java.util.UUID]
+          transactionId = java.util.UUID.fromString(transactionId.to_s) unless transactionId.nil?
+
+          # conversion for withPluginInfo [type = boolean]
+          withPluginInfo = withPluginInfo.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(withPluginInfo)
+
+          # conversion for withAttempts [type = boolean]
+          withAttempts = withAttempts.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(withAttempts)
+
+          # 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 context [type = org.killbill.billing.util.callcontext.TenantContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.get_payment_by_transaction_id(transactionId, withPluginInfo, withAttempts, properties, context)
+            # conversion for res [type = org.killbill.billing.payment.api.Payment]
+            res = Killbill::Plugin::Model::Payment.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.util.entity.Pagination getPayments(Java::java.lang.Long, Java::java.lang.Long, Java::boolean, Java::boolean, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.TenantContext)'
         def get_payments(offset, limit, withPluginInfo, withAttempts, properties, context)
 

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

@@ -43,14 +43,14 @@ module Killbill
           # conversion for name [type = java.lang.String]
           @name = @name.to_s unless @name.nil?
 
-          # conversion for plans [type = org.killbill.billing.catalog.api.Plan[]]
-          tmp = []
+          # conversion for plans [type = java.util.Collection]
+          tmp = java.util.ArrayList.new
           (@plans || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Plan]
             m = m.to_java unless m.nil?
-            tmp << m
+            tmp.add(m)
           end
-          @plans = tmp.to_java Java::org.killbill.billing.catalog.api.Plan
+          @plans = tmp
           self
         end
 
@@ -58,7 +58,7 @@ module Killbill
           # conversion for name [type = java.lang.String]
           @name = j_obj.name
 
-          # conversion for plans [type = org.killbill.billing.catalog.api.Plan[]]
+          # conversion for plans [type = java.util.Collection]
           @plans = j_obj.plans
           tmp = []
           (@plans || []).each do |m|

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

@@ -43,23 +43,23 @@ module Killbill
           # conversion for name [type = java.lang.String]
           @name = @name.to_s unless @name.nil?
 
-          # conversion for available [type = org.killbill.billing.catalog.api.Product[]]
-          tmp = []
+          # conversion for available [type = java.util.Collection]
+          tmp = java.util.ArrayList.new
           (@available || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Product]
             m = m.to_java unless m.nil?
-            tmp << m
+            tmp.add(m)
           end
-          @available = tmp.to_java Java::org.killbill.billing.catalog.api.Product
+          @available = tmp
 
-          # conversion for included [type = org.killbill.billing.catalog.api.Product[]]
-          tmp = []
+          # conversion for included [type = java.util.Collection]
+          tmp = java.util.ArrayList.new
           (@included || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Product]
             m = m.to_java unless m.nil?
-            tmp << m
+            tmp.add(m)
           end
-          @included = tmp.to_java Java::org.killbill.billing.catalog.api.Product
+          @included = tmp
 
           # conversion for category [type = org.killbill.billing.catalog.api.ProductCategory]
           @category = Java::org.killbill.billing.catalog.api.ProductCategory.value_of( @category.to_s ) unless @category.nil?
@@ -82,7 +82,7 @@ module Killbill
           # conversion for name [type = java.lang.String]
           @name = j_obj.name
 
-          # conversion for available [type = org.killbill.billing.catalog.api.Product[]]
+          # conversion for available [type = java.util.Collection]
           @available = j_obj.available
           tmp = []
           (@available || []).each do |m|
@@ -92,8 +92,8 @@ module Killbill
           end
           @available = tmp
 
-          # conversion for included [type = org.killbill.billing.catalog.api.Product[]]
-          @included = j_obj.get_included
+          # conversion for included [type = java.util.Collection]
+          @included = j_obj.included
           tmp = []
           (@included || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Product]

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

@@ -81,6 +81,7 @@ require 'killbill/gen/api/currency_conversion'
 require 'killbill/gen/api/currency_conversion_api'
 require 'killbill/gen/api/currency_conversion_exception'
 require 'killbill/gen/api/rate'
+require 'killbill/gen/api/base_entitlement_with_add_ons_specifier'
 require 'killbill/gen/api/blockable'
 require 'killbill/gen/api/blocking_api_exception'
 require 'killbill/gen/api/blocking_state'

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.catalog.api.SimplePlanDescriptor
 
-        attr_accessor :plan_id, :product_name, :currency, :amount, :billing_period, :trial_length, :trial_time_unit
+        attr_accessor :plan_id, :product_name, :product_category, :available_base_products, :currency, :amount, :billing_period, :trial_length, :trial_time_unit
 
         def initialize()
         end
@@ -46,6 +46,18 @@ module Killbill
           # conversion for product_name [type = java.lang.String]
           @product_name = @product_name.to_s unless @product_name.nil?
 
+          # conversion for product_category [type = org.killbill.billing.catalog.api.ProductCategory]
+          @product_category = Java::org.killbill.billing.catalog.api.ProductCategory.value_of( @product_category.to_s ) unless @product_category.nil?
+
+          # conversion for available_base_products [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@available_base_products || []).each do |m|
+            # conversion for m [type = java.lang.String]
+            m = m.to_s unless m.nil?
+            tmp.add(m)
+          end
+          @available_base_products = tmp
+
           # 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?
 
@@ -59,7 +71,7 @@ module Killbill
           # conversion for billing_period [type = org.killbill.billing.catalog.api.BillingPeriod]
           @billing_period = Java::org.killbill.billing.catalog.api.BillingPeriod.value_of( @billing_period.to_s ) unless @billing_period.nil?
 
-          # conversion for trial_length [type = int]
+          # conversion for trial_length [type = java.lang.Integer]
           @trial_length = @trial_length
 
           # conversion for trial_time_unit [type = org.killbill.billing.catalog.api.TimeUnit]
@@ -74,6 +86,19 @@ module Killbill
           # conversion for product_name [type = java.lang.String]
           @product_name = j_obj.product_name
 
+          # conversion for product_category [type = org.killbill.billing.catalog.api.ProductCategory]
+          @product_category = j_obj.product_category
+          @product_category = @product_category.to_s.to_sym unless @product_category.nil?
+
+          # conversion for available_base_products [type = java.util.List]
+          @available_base_products = j_obj.available_base_products
+          tmp = []
+          (@available_base_products || []).each do |m|
+            # conversion for m [type = java.lang.String]
+            tmp << m
+          end
+          @available_base_products = tmp
+
           # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
           @currency = j_obj.currency
           @currency = @currency.to_s.to_sym unless @currency.nil?
@@ -86,7 +111,7 @@ module Killbill
           @billing_period = j_obj.billing_period
           @billing_period = @billing_period.to_s.to_sym unless @billing_period.nil?
 
-          # conversion for trial_length [type = int]
+          # conversion for trial_length [type = java.lang.Integer]
           @trial_length = j_obj.trial_length
 
           # conversion for trial_time_unit [type = org.killbill.billing.catalog.api.TimeUnit]

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

@@ -62,14 +62,14 @@ module Killbill
           end
           @current_supported_currencies = tmp.to_java Java::org.killbill.billing.catalog.api.Currency
 
-          # conversion for current_products [type = org.killbill.billing.catalog.api.Product[]]
-          tmp = []
+          # 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 << m
+            tmp.add(m)
           end
-          @current_products = tmp.to_java Java::org.killbill.billing.catalog.api.Product
+          @current_products = tmp
 
           # conversion for current_units [type = org.killbill.billing.catalog.api.Unit[]]
           tmp = []
@@ -80,14 +80,14 @@ module Killbill
           end
           @current_units = tmp.to_java Java::org.killbill.billing.catalog.api.Unit
 
-          # conversion for current_plans [type = org.killbill.billing.catalog.api.Plan[]]
-          tmp = []
+          # 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 << m
+            tmp.add(m)
           end
-          @current_plans = tmp.to_java Java::org.killbill.billing.catalog.api.Plan
+          @current_plans = tmp
 
           # conversion for available_base_plan_listings [type = java.util.List]
           tmp = java.util.ArrayList.new
@@ -127,7 +127,7 @@ module Killbill
           end
           @current_supported_currencies = tmp
 
-          # conversion for current_products [type = org.killbill.billing.catalog.api.Product[]]
+          # conversion for current_products [type = java.util.Collection]
           @current_products = j_obj.current_products
           tmp = []
           (@current_products || []).each do |m|
@@ -147,7 +147,7 @@ module Killbill
           end
           @current_units = tmp
 
-          # conversion for current_plans [type = org.killbill.billing.catalog.api.Plan[]]
+          # conversion for current_plans [type = java.util.Collection]
           @current_plans = j_obj.current_plans
           tmp = []
           (@current_plans || []).each do |m|

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

@@ -110,6 +110,38 @@ module Killbill
           end
         end
 
+        java_signature 'Java::java.util.Map searchTenantKeyValues(Java::java.lang.String, Java::org.killbill.billing.util.callcontext.TenantContext)'
+        def search_tenant_key_values(searchKey, context)
+
+          # conversion for searchKey [type = java.lang.String]
+          searchKey = searchKey.to_s unless searchKey.nil?
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.search_tenant_key_values(searchKey, context)
+            # conversion for res [type = java.util.Map]
+            tmp = {}
+            jtmp0 = res || java.util.HashMap.new
+            jtmp0.key_set.each do |k|
+              # conversion for k [type = java.lang.String]
+              v = jtmp0.get(k)
+                # conversion for v [type = java.util.List]
+                tmp1 = []
+                (v || []).each do |m|
+                  # conversion for m [type = java.lang.String]
+                  tmp1 << m
+                end
+                v = tmp1
+                tmp[k] = v
+              end
+            res = tmp
+            return res
+          rescue Java::org.killbill.billing.tenant.api.TenantApiException => e
+            raise Killbill::Plugin::Model::TenantApiException.new.to_ruby(e)
+          end
+        end
+
         java_signature 'Java::void addTenantKeyValue(Java::java.lang.String, Java::java.lang.String, Java::org.killbill.billing.util.callcontext.CallContext)'
         def add_tenant_key_value(key, value, context)