killbill 1.1.2 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/gen_config/api.conf

@@ -0,0 +1,42 @@
+-i
+file:///<PATH_TO_REPO>/killbill-api/src/main/java/
+-o
+/tmp/output
+-t
+JRUBY_PLUGIN
+-q
+com.ning.billing,
+com.ning.billing.account,
+com.ning.billing.account.api,
+com.ning.billing.catalog,
+com.ning.billing.catalog.api,
+com.ning.billing.entitlement,
+com.ning.billing.entitlement.api,
+com.ning.billing.entitlement.api.user,
+com.ning.billing.invoice,
+com.ning.billing.invoice.api,
+com.ning.billing.invoice.api.formatters,
+com.ning.billing.junction,
+com.ning.billing.junction.api,
+com.ning.billing.osgi,
+com.ning.billing.osgi.api,
+com.ning.billing.osgi.api.config,
+com.ning.billing.payment,
+com.ning.billing.payment.api,
+com.ning.billing.tenant,
+com.ning.billing.tenant.api,
+com.ning.billing.usage,
+com.ning.billing.usage.api,
+com.ning.billing.util,
+com.ning.billing.util.api,
+com.ning.billing.util.callcontext,
+com.ning.billing.util.customfield,
+com.ning.billing.util.entity,
+com.ning.billing.util.tag
+-x
+ExportUserApi,
+PluginConfig,
+PluginJavaConfig,
+PluginRubyConfig
+-m
+JRUBY_API

data/gen_config/plugin_api.conf

@@ -0,0 +1,14 @@
+-i
+file:///PATH_TO_REPO/killbill-plugin-api/payment/src/main/java,
+file:///PATH_TO_REPO/killbill-plugin-api/notification/src/main/java,
+file:///PATH_TO_REPO/killbill-api/src/main/java/
+-o
+/tmp/output
+-t
+JRUBY_PLUGIN
+-q
+com.ning.billing.payment.plugin.api,
+com.ning.billing.notification.plugin.api
+-m
+JRUBY_PLUGIN_API
+

data/lib/killbill.rb

@@ -48,13 +48,13 @@ begin
   end
   # jbundler needs to be loaded first!
   require 'killbill/jplugin'
-  require 'killbill/jpayment'
-  require 'killbill/jnotification'
 rescue LoadError => e
   warn "You need JRuby to run Killbill plugins #{e}"
 end
 
 require 'tzinfo'
-require 'killbill/gen/require_gen'
+require 'bigdecimal'
+require 'killbill/gen/api/require_gen'
+require 'killbill/gen/plugin-api/require_gen'
 require 'killbill/notification'
 require 'killbill/payment'

data/lib/killbill/gen/{account_user_api.rb → api/account_user_api.rb}

@@ -39,28 +39,14 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.account.api.Account createAccount(Java::com.ning.billing.account.api.AccountData, Java::com.ning.billing.util.callcontext.CallContext)'
         def create_account(data, context)
+
           # conversion for data [type = com.ning.billing.account.api.AccountData]
           data = data.to_java unless data.nil?
-          # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
-          context = context.to_java unless context.nil?
-          begin
-            res = @real_java_api.create_account(data, context)
-            # conversion for res [type = com.ning.billing.account.api.Account]
-            res = Killbill::Plugin::Model::Account.new.to_ruby(res) unless res.nil?
-            return res
-          rescue Java::com.ning.billing.account.api.AccountApiException => e
-            raise Killbill::Plugin::Model::AccountApiException.new.to_ruby(e)
-          end
-        end
 
-        java_signature 'Java::com.ning.billing.account.api.Account migrateAccount(Java::com.ning.billing.account.api.MigrationAccountData, Java::com.ning.billing.util.callcontext.CallContext)'
-        def migrate_account(data, context)
-          # conversion for data [type = com.ning.billing.account.api.MigrationAccountData]
-          data = data.to_java unless data.nil?
           # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.migrate_account(data, context)
+            res = @real_java_api.create_account(data, context)
             # conversion for res [type = com.ning.billing.account.api.Account]
             res = Killbill::Plugin::Model::Account.new.to_ruby(res) unless res.nil?
             return res
@@ -71,8 +57,10 @@ module Killbill
 
         java_signature 'Java::void updateAccount(Java::com.ning.billing.account.api.Account, Java::com.ning.billing.util.callcontext.CallContext)'
         def update_account(account, context)
+
           # conversion for account [type = com.ning.billing.account.api.Account]
           account = account.to_java unless account.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           @real_java_api.update_account(account, context)
@@ -80,8 +68,10 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.account.api.Account getAccountByKey(Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_account_by_key(key, context)
+
           # conversion for key [type = java.lang.String]
           key = key.to_s unless key.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           begin
@@ -96,8 +86,10 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.account.api.Account getAccountById(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_account_by_id(accountId, context)
+
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           begin
@@ -112,6 +104,7 @@ module Killbill
 
         java_signature 'Java::java.util.List getAccounts(Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_accounts(context)
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_accounts(context)
@@ -128,8 +121,10 @@ module Killbill
 
         java_signature 'Java::java.util.UUID getIdFromKey(Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_id_from_key(externalKey, context)
+
           # conversion for externalKey [type = java.lang.String]
           externalKey = externalKey.to_s unless externalKey.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           begin
@@ -144,8 +139,10 @@ module Killbill
 
         java_signature 'Java::java.util.List getEmails(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_emails(accountId, context)
+
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_emails(accountId, context)
@@ -162,10 +159,13 @@ module Killbill
 
         java_signature 'Java::void addEmail(Java::java.util.UUID, Java::com.ning.billing.account.api.AccountEmail, Java::com.ning.billing.util.callcontext.CallContext)'
         def add_email(accountId, email, context)
+
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
+
           # conversion for email [type = com.ning.billing.account.api.AccountEmail]
           email = email.to_java unless email.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           @real_java_api.add_email(accountId, email, context)
@@ -173,10 +173,13 @@ module Killbill
 
         java_signature 'Java::void removeEmail(Java::java.util.UUID, Java::com.ning.billing.account.api.AccountEmail, Java::com.ning.billing.util.callcontext.CallContext)'
         def remove_email(accountId, email, context)
+
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
+
           # conversion for email [type = com.ning.billing.account.api.AccountEmail]
           email = email.to_java unless email.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           @real_java_api.remove_email(accountId, email, context)

data/lib/killbill/gen/{audit_user_api.rb → api/audit_user_api.rb}

@@ -39,10 +39,13 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.util.audit.AuditLogsForAccount getAuditLogsForAccount(Java::java.util.UUID, Java::com.ning.billing.util.api.AuditLevel, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_audit_logs_for_account(accountId, auditLevel, context)
+
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
+
           # conversion for auditLevel [type = com.ning.billing.util.api.AuditLevel]
           auditLevel = Java::com.ning.billing.util.api.AuditLevel.value_of("#{auditLevel.to_s}") unless auditLevel.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_audit_logs_for_account(accountId, auditLevel, context)
@@ -53,10 +56,13 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.util.audit.AuditLogsForBundles getAuditLogsForBundle(Java::java.util.UUID, Java::com.ning.billing.util.api.AuditLevel, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_audit_logs_for_bundle(bundleId, auditLevel, context)
+
           # conversion for bundleId [type = java.util.UUID]
           bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
+
           # conversion for auditLevel [type = com.ning.billing.util.api.AuditLevel]
           auditLevel = Java::com.ning.billing.util.api.AuditLevel.value_of("#{auditLevel.to_s}") unless auditLevel.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           begin
@@ -71,6 +77,7 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.util.audit.AuditLogsForBundles getAuditLogsForBundles(Java::java.util.List, Java::com.ning.billing.util.api.AuditLevel, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_audit_logs_for_bundles(bundles, auditLevel, context)
+
           # conversion for bundles [type = java.util.List]
           tmp = java.util.ArrayList.new
           (bundles || []).each do |m|
@@ -79,8 +86,10 @@ module Killbill
             tmp.add(m)
           end
           bundles = tmp
+
           # conversion for auditLevel [type = com.ning.billing.util.api.AuditLevel]
           auditLevel = Java::com.ning.billing.util.api.AuditLevel.value_of("#{auditLevel.to_s}") unless auditLevel.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_audit_logs_for_bundles(bundles, auditLevel, context)
@@ -91,6 +100,7 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.util.audit.AuditLogsForInvoicePayments getAuditLogsForInvoicePayments(Java::java.util.List, Java::com.ning.billing.util.api.AuditLevel, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_audit_logs_for_invoice_payments(invoicePayments, auditLevel, context)
+
           # conversion for invoicePayments [type = java.util.List]
           tmp = java.util.ArrayList.new
           (invoicePayments || []).each do |m|
@@ -99,8 +109,10 @@ module Killbill
             tmp.add(m)
           end
           invoicePayments = tmp
+
           # conversion for auditLevel [type = com.ning.billing.util.api.AuditLevel]
           auditLevel = Java::com.ning.billing.util.api.AuditLevel.value_of("#{auditLevel.to_s}") unless auditLevel.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_audit_logs_for_invoice_payments(invoicePayments, auditLevel, context)
@@ -111,6 +123,7 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.util.audit.AuditLogsForRefunds getAuditLogsForRefunds(Java::java.util.List, Java::com.ning.billing.util.api.AuditLevel, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_audit_logs_for_refunds(refunds, auditLevel, context)
+
           # conversion for refunds [type = java.util.List]
           tmp = java.util.ArrayList.new
           (refunds || []).each do |m|
@@ -119,8 +132,10 @@ module Killbill
             tmp.add(m)
           end
           refunds = tmp
+
           # conversion for auditLevel [type = com.ning.billing.util.api.AuditLevel]
           auditLevel = Java::com.ning.billing.util.api.AuditLevel.value_of("#{auditLevel.to_s}") unless auditLevel.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_audit_logs_for_refunds(refunds, auditLevel, context)
@@ -131,6 +146,7 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.util.audit.AuditLogsForPayments getAuditLogsForPayments(Java::java.util.List, Java::com.ning.billing.util.api.AuditLevel, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_audit_logs_for_payments(payments, auditLevel, context)
+
           # conversion for payments [type = java.util.List]
           tmp = java.util.ArrayList.new
           (payments || []).each do |m|
@@ -139,8 +155,10 @@ module Killbill
             tmp.add(m)
           end
           payments = tmp
+
           # conversion for auditLevel [type = com.ning.billing.util.api.AuditLevel]
           auditLevel = Java::com.ning.billing.util.api.AuditLevel.value_of("#{auditLevel.to_s}") unless auditLevel.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_audit_logs_for_payments(payments, auditLevel, context)
@@ -151,6 +169,7 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.util.audit.AuditLogsForInvoices getAuditLogsForInvoices(Java::java.util.List, Java::com.ning.billing.util.api.AuditLevel, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_audit_logs_for_invoices(invoices, auditLevel, context)
+
           # conversion for invoices [type = java.util.List]
           tmp = java.util.ArrayList.new
           (invoices || []).each do |m|
@@ -159,8 +178,10 @@ module Killbill
             tmp.add(m)
           end
           invoices = tmp
+
           # conversion for auditLevel [type = com.ning.billing.util.api.AuditLevel]
           auditLevel = Java::com.ning.billing.util.api.AuditLevel.value_of("#{auditLevel.to_s}") unless auditLevel.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_audit_logs_for_invoices(invoices, auditLevel, context)
@@ -171,12 +192,16 @@ module Killbill
 
         java_signature 'Java::java.util.List getAuditLogs(Java::java.util.UUID, Java::com.ning.billing.ObjectType, Java::com.ning.billing.util.api.AuditLevel, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_audit_logs(objectId, objectType, auditLevel, context)
+
           # conversion for objectId [type = java.util.UUID]
           objectId = java.util.UUID.fromString(objectId.to_s) unless objectId.nil?
+
           # conversion for objectType [type = com.ning.billing.ObjectType]
           objectType = Java::com.ning.billing.ObjectType.value_of("#{objectType.to_s}") unless objectType.nil?
+
           # conversion for auditLevel [type = com.ning.billing.util.api.AuditLevel]
           auditLevel = Java::com.ning.billing.util.api.AuditLevel.value_of("#{auditLevel.to_s}") unless auditLevel.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_audit_logs(objectId, objectType, auditLevel, context)

data/lib/killbill/gen/{catalog_user_api.rb → api/catalog_user_api.rb}

@@ -39,8 +39,10 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.catalog.api.Catalog getCatalog(Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_catalog(catalogName, context)
+
           # conversion for catalogName [type = java.lang.String]
           catalogName = catalogName.to_s unless catalogName.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_catalog(catalogName, context)

data/lib/killbill/gen/{custom_field_user_api.rb → api/custom_field_user_api.rb}

@@ -39,6 +39,7 @@ module Killbill
 
         java_signature 'Java::void addCustomFields(Java::java.util.List, Java::com.ning.billing.util.callcontext.CallContext)'
         def add_custom_fields(fields, context)
+
           # conversion for fields [type = java.util.List]
           tmp = java.util.ArrayList.new
           (fields || []).each do |m|
@@ -47,6 +48,7 @@ module Killbill
             tmp.add(m)
           end
           fields = tmp
+
           # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           @real_java_api.add_custom_fields(fields, context)
@@ -54,10 +56,13 @@ module Killbill
 
         java_signature 'Java::java.util.List getCustomFieldsForObject(Java::java.util.UUID, Java::com.ning.billing.ObjectType, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_custom_fields_for_object(objectId, objectType, context)
+
           # conversion for objectId [type = java.util.UUID]
           objectId = java.util.UUID.fromString(objectId.to_s) unless objectId.nil?
+
           # conversion for objectType [type = com.ning.billing.ObjectType]
           objectType = Java::com.ning.billing.ObjectType.value_of("#{objectType.to_s}") unless objectType.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_custom_fields_for_object(objectId, objectType, context)
@@ -74,10 +79,13 @@ module Killbill
 
         java_signature 'Java::java.util.List getCustomFieldsForAccountType(Java::java.util.UUID, Java::com.ning.billing.ObjectType, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_custom_fields_for_account_type(accountId, objectType, context)
+
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
+
           # conversion for objectType [type = com.ning.billing.ObjectType]
           objectType = Java::com.ning.billing.ObjectType.value_of("#{objectType.to_s}") unless objectType.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_custom_fields_for_account_type(accountId, objectType, context)
@@ -94,8 +102,10 @@ module Killbill
 
         java_signature 'Java::java.util.List getCustomFieldsForAccount(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_custom_fields_for_account(accountId, context)
+
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_custom_fields_for_account(accountId, context)

data/lib/killbill/gen/{entitlement_user_api.rb → api/entitlement_user_api.rb}

@@ -39,8 +39,10 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.entitlement.api.user.SubscriptionBundle getBundleFromId(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_bundle_from_id(id, context)
+
           # conversion for id [type = java.util.UUID]
           id = java.util.UUID.fromString(id.to_s) unless id.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           begin
@@ -55,8 +57,10 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.entitlement.api.user.Subscription getSubscriptionFromId(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_subscription_from_id(id, context)
+
           # conversion for id [type = java.util.UUID]
           id = java.util.UUID.fromString(id.to_s) unless id.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           begin
@@ -71,8 +75,10 @@ module Killbill
 
         java_signature 'Java::java.util.List getBundlesForKey(Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_bundles_for_key(bundleKey, context)
+
           # conversion for bundleKey [type = java.lang.String]
           bundleKey = bundleKey.to_s unless bundleKey.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           begin
@@ -93,10 +99,13 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.entitlement.api.user.SubscriptionBundle getBundleForAccountAndKey(Java::java.util.UUID, Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_bundle_for_account_and_key(accountId, bundleKey, context)
+
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
+
           # conversion for bundleKey [type = java.lang.String]
           bundleKey = bundleKey.to_s unless bundleKey.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           begin
@@ -111,8 +120,10 @@ module Killbill
 
         java_signature 'Java::java.util.List getBundlesForAccount(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_bundles_for_account(accountId, context)
+
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_bundles_for_account(accountId, context)
@@ -129,8 +140,10 @@ module Killbill
 
         java_signature 'Java::java.util.List getSubscriptionsForBundle(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_subscriptions_for_bundle(bundleId, context)
+
           # conversion for bundleId [type = java.util.UUID]
           bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_subscriptions_for_bundle(bundleId, context)
@@ -147,10 +160,13 @@ module Killbill
 
         java_signature 'Java::java.util.List getSubscriptionsForAccountAndKey(Java::java.util.UUID, Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_subscriptions_for_account_and_key(accountId, bundleKey, context)
+
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
+
           # conversion for bundleKey [type = java.lang.String]
           bundleKey = bundleKey.to_s unless bundleKey.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_subscriptions_for_account_and_key(accountId, bundleKey, context)
@@ -167,8 +183,10 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.entitlement.api.user.Subscription getBaseSubscription(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_base_subscription(bundleId, context)
+
           # conversion for bundleId [type = java.util.UUID]
           bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           begin
@@ -183,10 +201,13 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.entitlement.api.user.SubscriptionBundle createBundleForAccount(Java::java.util.UUID, Java::java.lang.String, Java::com.ning.billing.util.callcontext.CallContext)'
         def create_bundle_for_account(accountId, bundleKey, context)
+
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
+
           # conversion for bundleKey [type = java.lang.String]
           bundleKey = bundleKey.to_s unless bundleKey.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           begin
@@ -201,15 +222,19 @@ module Killbill
 
         java_signature 'Java::com.ning.billing.entitlement.api.user.Subscription createSubscription(Java::java.util.UUID, Java::com.ning.billing.catalog.api.PlanPhaseSpecifier, Java::org.joda.time.DateTime, Java::com.ning.billing.util.callcontext.CallContext)'
         def create_subscription(bundleId, spec, requestedDate, context)
+
           # conversion for bundleId [type = java.util.UUID]
           bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
+
           # conversion for spec [type = com.ning.billing.catalog.api.PlanPhaseSpecifier]
           spec = spec.to_java unless spec.nil?
+
           # conversion for requestedDate [type = org.joda.time.DateTime]
           if !requestedDate.nil?
             requestedDate =  (requestedDate.kind_of? Time) ? DateTime.parse(requestedDate.to_s) : requestedDate
             requestedDate = Java::org.joda.time.DateTime.new(requestedDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
           end
+
           # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           begin
@@ -224,15 +249,19 @@ module Killbill
 
         java_signature 'Java::java.util.List getDryRunChangePlanStatus(Java::java.util.UUID, Java::java.lang.String, Java::org.joda.time.DateTime, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_dry_run_change_plan_status(subscriptionId, productName, requestedDate, context)
+
           # conversion for subscriptionId [type = java.util.UUID]
           subscriptionId = java.util.UUID.fromString(subscriptionId.to_s) unless subscriptionId.nil?
+
           # conversion for productName [type = java.lang.String]
           productName = productName.to_s unless productName.nil?
+
           # conversion for requestedDate [type = org.joda.time.DateTime]
           if !requestedDate.nil?
             requestedDate =  (requestedDate.kind_of? Time) ? DateTime.parse(requestedDate.to_s) : requestedDate
             requestedDate = Java::org.joda.time.DateTime.new(requestedDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
           end
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           begin
@@ -253,8 +282,10 @@ module Killbill
 
         java_signature 'Java::org.joda.time.DateTime getNextBillingDate(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_next_billing_date(account, context)
+
           # conversion for account [type = java.util.UUID]
           account = java.util.UUID.fromString(account.to_s) unless account.nil?
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           res = @real_java_api.get_next_billing_date(account, context)