killbill 4.4.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b639aaed938ecf637af46e615808a71eac5fcba
-  data.tar.gz: 1b2da466452c79fc71c7ae2fe7419079c5ba1e35
+  metadata.gz: 21df35391fbf9f2551bf8ecb5d9fa8193a2d4194
+  data.tar.gz: 9d22abee0b210c4d8c9f4cf59811c2692075ab17
 SHA512:
-  metadata.gz: 66a2b3fb95684789082f9370f67412cdbc6ae488dfbab1bcfc1ab8b99aaaa0d61cc509ed3ff9f581fe5917ad5bd083ca3c30daca48fdfa028609e60c22762f95
-  data.tar.gz: b18cb490e2c1fa6246cbd2229281f012f08414a8867b9f70b215c476bd38129cb136b32623607fa6db80d3f3abd84f94653a84c34ee0a2fbbd052db16aa70971
+  metadata.gz: ae6650bd31d1c941b6cc6050a5a1db32fea55e6550f6883dbc3673288d74d731deaa20aa30caf032427b478078180cd8cfaff72a10dc6d7e96c9e61f2f8250d0
+  data.tar.gz: 7b3e662977b149e2e68f0a62c38272c362c3d19fd40d86efad06c62984d460a8a7437be192d9aa6eda80d96da24c746fe7deb0e00dba378dbfef2b07e637f287

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill (4.4.0)
+    killbill (5.0.0)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)
@@ -131,4 +131,4 @@ DEPENDENCIES
   thread_safe (~> 0.3.4)
 
 BUNDLED WITH
-   1.10.5
+   1.10.6

data/Jarfile

@@ -1,10 +1,11 @@
-jar 'org.kill-bill.billing:killbill-api', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.11'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.11'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.11'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.11'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.11'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.11'
+jar 'org.kill-bill.billing:killbill-api', '0.19'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.12'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.12'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.12'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.12'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.12'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.12'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.12'
 jar 'org.kill-bill.billing:killbill-util:tests', '0.14.0'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/Jarfile.lock

@@ -1,12 +1,13 @@
-org.kill-bill.billing:killbill-api:jar:0.18
+org.kill-bill.billing:killbill-api:jar:0.19
 com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
 joda-time:joda-time:jar:2.3
-org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.11
-org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.11
-org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.11
-org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.11
-org.kill-bill.billing.plugin:killbill-plugin-api-routing:jar:0.11
-org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.11
+org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.12
+org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.12
+org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.12
+org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.12
+org.kill-bill.billing.plugin:killbill-plugin-api-routing:jar:0.12
+org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.12
+org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.12
 org.kill-bill.billing:killbill-util:jar:tests:0.14.0
 com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
 com.fasterxml.jackson.core:jackson-core:jar:2.4.3

data/NEWS

@@ -1,3 +1,7 @@
+5.0.0
+    Add entitlement plugin api
+    Rename payment routing plugin api to payment control plugin api
+
 4.0.0
     Initial release for Kill Bill 0.14.x
 

data/gen_config/plugin_api.conf

@@ -4,8 +4,9 @@ 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-plugin-api/invoice/src/main/java, \
 file://$PATH_TO_REPO/killbill-plugin-api/currency/src/main/java, \
-file://$PATH_TO_REPO/killbill-plugin-api/routing/src/main/java, \
+file://$PATH_TO_REPO/killbill-plugin-api/control/src/main/java, \
 file://$PATH_TO_REPO/killbill-plugin-api/catalog/src/main/java, \
+file://$PATH_TO_REPO/killbill-plugin-api/entitlement/src/main/java, \
 file://$PATH_TO_REPO/killbill-api/src/main/java/ \
 -o \
 /tmp/output \
@@ -16,7 +17,8 @@ org.killbill.billing.payment.plugin.api, \
 org.killbill.billing.notification.plugin.api, \
 org.killbill.billing.invoice.plugin.api \
 org.killbill.billing.currency.plugin.api \
-org.killbill.billing.routing.plugin.api \
+org.killbill.billing.control.plugin.api \
 org.killbill.billing.catalog.plugin.api \
+org.killbill.billing.entitlement.plugin.api \
 -m \
 JRUBY_PLUGIN_API

data/generators/active_merchant/templates/Jarfile.rb

@@ -1,10 +1,11 @@
-jar 'org.kill-bill.billing:killbill-api', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.11'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.11'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.11'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.11'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.11'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.11'
+jar 'org.kill-bill.billing:killbill-api', '0.19'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.12'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.12'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.12'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.12'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.12'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.12'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.12'
 jar 'org.kill-bill.billing:killbill-util:tests', '0.14.0'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/generators/active_merchant/templates/config.yml.rb

@@ -5,8 +5,11 @@
 # SQLite (development)
   :adapter: sqlite3
   :database: test.db
+# For PostgreSQL
+#  :adapter: postgresql
+#  :database: 'killbill'
 # For MySQL
-#  :adapter: mysql
+#  :adapter: mariadb
 #  :username: 'killbill'
 #  :password: 'killbill'
 #  :database: 'killbill' # or set the URL :

data/generators/active_merchant/templates/db/ddl.sql.rb

@@ -1,75 +1,75 @@
-CREATE TABLE `<%= identifier %>_payment_methods` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `kb_payment_method_id` varchar(255) DEFAULT NULL,
-  `token` varchar(255) DEFAULT NULL,
-  `cc_first_name` varchar(255) DEFAULT NULL,
-  `cc_last_name` varchar(255) DEFAULT NULL,
-  `cc_type` varchar(255) DEFAULT NULL,
-  `cc_exp_month` varchar(255) DEFAULT NULL,
-  `cc_exp_year` varchar(255) DEFAULT NULL,
-  `cc_number` varchar(255) DEFAULT NULL,
-  `cc_last_4` varchar(255) DEFAULT NULL,
-  `cc_start_month` varchar(255) DEFAULT NULL,
-  `cc_start_year` varchar(255) DEFAULT NULL,
-  `cc_issue_number` varchar(255) DEFAULT NULL,
-  `cc_verification_value` varchar(255) DEFAULT NULL,
-  `cc_track_data` varchar(255) DEFAULT NULL,
-  `address1` varchar(255) DEFAULT NULL,
-  `address2` varchar(255) DEFAULT NULL,
-  `city` varchar(255) DEFAULT NULL,
-  `state` varchar(255) DEFAULT NULL,
-  `zip` varchar(255) DEFAULT NULL,
-  `country` varchar(255) DEFAULT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `created_at` datetime NOT NULL,
-  `updated_at` datetime NOT NULL,
-  `kb_account_id` varchar(255) DEFAULT NULL,
-  `kb_tenant_id` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `index_<%= identifier %>_payment_methods_on_kb_account_id` (`kb_account_id`),
-  KEY `index_<%= identifier %>_payment_methods_on_kb_payment_method_id` (`kb_payment_method_id`)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+CREATE TABLE <%= identifier %>_payment_methods (
+  id serial UNIQUE,
+  kb_payment_method_id varchar(255) DEFAULT NULL,
+  token varchar(255) DEFAULT NULL,
+  cc_first_name varchar(255) DEFAULT NULL,
+  cc_last_name varchar(255) DEFAULT NULL,
+  cc_type varchar(255) DEFAULT NULL,
+  cc_exp_month varchar(255) DEFAULT NULL,
+  cc_exp_year varchar(255) DEFAULT NULL,
+  cc_number varchar(255) DEFAULT NULL,
+  cc_last_4 varchar(255) DEFAULT NULL,
+  cc_start_month varchar(255) DEFAULT NULL,
+  cc_start_year varchar(255) DEFAULT NULL,
+  cc_issue_number varchar(255) DEFAULT NULL,
+  cc_verification_value varchar(255) DEFAULT NULL,
+  cc_track_data varchar(255) DEFAULT NULL,
+  address1 varchar(255) DEFAULT NULL,
+  address2 varchar(255) DEFAULT NULL,
+  city varchar(255) DEFAULT NULL,
+  state varchar(255) DEFAULT NULL,
+  zip varchar(255) DEFAULT NULL,
+  country varchar(255) DEFAULT NULL,
+  is_deleted boolean NOT NULL DEFAULT '0',
+  created_at datetime NOT NULL,
+  updated_at datetime NOT NULL,
+  kb_account_id varchar(255) DEFAULT NULL,
+  kb_tenant_id varchar(255) DEFAULT NULL,
+  PRIMARY KEY (id)
+) /*! ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin */;
+CREATE INDEX index_<%= identifier %>_payment_methods_kb_account_id ON <%= identifier %>_payment_methods(kb_account_id);
+CREATE INDEX index_<%= identifier %>_payment_methods_kb_payment_method_id ON <%= identifier %>_payment_methods(kb_payment_method_id);
 
-CREATE TABLE `<%= identifier %>_transactions` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `<%= identifier %>_response_id` int(11) NOT NULL,
-  `api_call` varchar(255) NOT NULL,
-  `kb_payment_id` varchar(255) NOT NULL,
-  `kb_payment_transaction_id` varchar(255) NOT NULL,
-  `transaction_type` varchar(255) NOT NULL,
-  `payment_processor_account_id` varchar(255) DEFAULT NULL,
-  `txn_id` varchar(255) DEFAULT NULL,
-  `amount_in_cents` int(11) DEFAULT NULL,
-  `currency` varchar(255) DEFAULT NULL,
-  `created_at` datetime NOT NULL,
-  `updated_at` datetime NOT NULL,
-  `kb_account_id` varchar(255) NOT NULL,
-  `kb_tenant_id` varchar(255) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `index_<%= identifier %>_transactions_on_kb_payment_id` (`kb_payment_id`)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+CREATE TABLE <%= identifier %>_transactions (
+  id serial UNIQUE,
+  <%= identifier %>_response_id bigint /*! unsigned */ NOT NULL,
+  api_call varchar(255) NOT NULL,
+  kb_payment_id varchar(255) NOT NULL,
+  kb_payment_transaction_id varchar(255) NOT NULL,
+  transaction_type varchar(255) NOT NULL,
+  payment_processor_account_id varchar(255) DEFAULT NULL,
+  txn_id varchar(255) DEFAULT NULL,
+  amount_in_cents int DEFAULT NULL,
+  currency varchar(255) DEFAULT NULL,
+  created_at datetime NOT NULL,
+  updated_at datetime NOT NULL,
+  kb_account_id varchar(255) NOT NULL,
+  kb_tenant_id varchar(255) NOT NULL,
+  PRIMARY KEY (id)
+) /*! ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin */;
+CREATE INDEX index_<%= identifier %>_transactions_kb_payment_id ON <%= identifier %>_transactions(kb_payment_id);
 
-CREATE TABLE `<%= identifier %>_responses` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `api_call` varchar(255) NOT NULL,
-  `kb_payment_id` varchar(255) DEFAULT NULL,
-  `kb_payment_transaction_id` varchar(255) DEFAULT NULL,
-  `transaction_type` varchar(255) DEFAULT NULL,
-  `payment_processor_account_id` varchar(255) DEFAULT NULL,
-  `message` varchar(255) DEFAULT NULL,
-  `authorization` varchar(255) DEFAULT NULL,
-  `fraud_review` tinyint(1) DEFAULT NULL,
-  `test` tinyint(1) DEFAULT NULL,
-  `avs_result_code` varchar(255) DEFAULT NULL,
-  `avs_result_message` varchar(255) DEFAULT NULL,
-  `avs_result_street_match` varchar(255) DEFAULT NULL,
-  `avs_result_postal_match` varchar(255) DEFAULT NULL,
-  `cvv_result_code` varchar(255) DEFAULT NULL,
-  `cvv_result_message` varchar(255) DEFAULT NULL,
-  `success` tinyint(1) DEFAULT NULL,
-  `created_at` datetime NOT NULL,
-  `updated_at` datetime NOT NULL,
-  `kb_account_id` varchar(255) DEFAULT NULL,
-  `kb_tenant_id` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+CREATE TABLE <%= identifier %>_responses (
+  id serial UNIQUE,
+  api_call varchar(255) NOT NULL,
+  kb_payment_id varchar(255) DEFAULT NULL,
+  kb_payment_transaction_id varchar(255) DEFAULT NULL,
+  transaction_type varchar(255) DEFAULT NULL,
+  payment_processor_account_id varchar(255) DEFAULT NULL,
+  message varchar(255) DEFAULT NULL,
+  authorisation varchar(255) DEFAULT NULL,
+  fraud_review boolean DEFAULT NULL,
+  test boolean DEFAULT NULL,
+  avs_result_code varchar(255) DEFAULT NULL,
+  avs_result_message varchar(255) DEFAULT NULL,
+  avs_result_street_match varchar(255) DEFAULT NULL,
+  avs_result_postal_match varchar(255) DEFAULT NULL,
+  cvv_result_code varchar(255) DEFAULT NULL,
+  cvv_result_message varchar(255) DEFAULT NULL,
+  success boolean DEFAULT NULL,
+  created_at datetime NOT NULL,
+  updated_at datetime NOT NULL,
+  kb_account_id varchar(255) DEFAULT NULL,
+  kb_tenant_id varchar(255) DEFAULT NULL,
+  PRIMARY KEY (id)
+) /*! ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin */;

data/generators/active_merchant/templates/plugin.gemspec.rb

@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
   if defined?(JRUBY_VERSION)
     s.add_development_dependency 'jdbc-sqlite3', '~> 3.7'
     s.add_development_dependency 'jdbc-mariadb', '~> 1.1'
+    s.add_development_dependency 'jdbc-postgres', '~> 9.4'
   else
     s.add_development_dependency 'sqlite3', '~> 1.3.7'
   end

data/generators/active_merchant/templates/spec/integration_spec.rb

@@ -7,13 +7,14 @@ describe Killbill::<%= class_name %>::PaymentPlugin do
   include ::Killbill::Plugin::ActiveMerchant::RSpec
 
   before(:each) do
+    # Start the plugin early to configure ActiveRecord
+    @plugin = build_plugin(::Killbill::<%= class_name %>::PaymentPlugin, '<%= identifier %>')
+    @plugin.start_plugin
+
     ::Killbill::<%= class_name %>::<%= class_name %>PaymentMethod.delete_all
     ::Killbill::<%= class_name %>::<%= class_name %>Response.delete_all
     ::Killbill::<%= class_name %>::<%= class_name %>Transaction.delete_all
 
-    @plugin = build_plugin(::Killbill::<%= class_name %>::PaymentPlugin, '<%= identifier %>')
-    @plugin.start_plugin
-
     @call_context = build_call_context
 
     @properties = []

data/lib/killbill/entitlement.rb

@@ -0,0 +1,23 @@
+require 'killbill/plugin'
+
+module Killbill
+  module Plugin
+    class EntitlementPluginApi < Notification
+
+      class OperationUnsupportedByGatewayError < NotImplementedError
+      end
+
+      def prior_call(entitlement_context, properties)
+        raise OperationUnsupportedByGatewayError
+      end
+
+      def on_success_call(entitlement_context, properties)
+        raise OperationUnsupportedByGatewayError
+      end
+
+      def on_failure_call(entitlement_context, properties)
+        raise OperationUnsupportedByGatewayError
+      end
+    end
+  end
+end

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

@@ -39,8 +39,8 @@ module Killbill
         end
 
 
-        java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement createBaseEntitlement(Java::java.util.UUID, Java::org.killbill.billing.catalog.api.PlanPhaseSpecifier, Java::java.lang.String, Java::java.util.List, Java::org.joda.time.LocalDate, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def create_base_entitlement(accountId, spec, externalKey, overrides, effectiveDate, context)
+        java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement createBaseEntitlement(Java::java.util.UUID, Java::org.killbill.billing.catalog.api.PlanPhaseSpecifier, Java::java.lang.String, Java::java.util.List, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def create_base_entitlement(accountId, spec, externalKey, overrides, effectiveDate, properties, context)
 
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
@@ -65,10 +65,19 @@ module Killbill
             effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
           end
 
+          # 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.CallContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.create_base_entitlement(accountId, spec, externalKey, overrides, effectiveDate, context)
+            res = @real_java_api.create_base_entitlement(accountId, spec, externalKey, overrides, effectiveDate, properties, context)
             # conversion for res [type = org.killbill.billing.entitlement.api.Entitlement]
             res = Killbill::Plugin::Model::Entitlement.new.to_ruby(res) unless res.nil?
             return res
@@ -77,8 +86,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement addEntitlement(Java::java.util.UUID, Java::org.killbill.billing.catalog.api.PlanPhaseSpecifier, Java::java.util.List, Java::org.joda.time.LocalDate, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def add_entitlement(bundleId, spec, overrides, effectiveDate, context)
+        java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement addEntitlement(Java::java.util.UUID, Java::org.killbill.billing.catalog.api.PlanPhaseSpecifier, Java::java.util.List, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def add_entitlement(bundleId, spec, overrides, effectiveDate, properties, context)
 
           # conversion for bundleId [type = java.util.UUID]
           bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
@@ -100,10 +109,19 @@ module Killbill
             effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
           end
 
+          # 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.CallContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.add_entitlement(bundleId, spec, overrides, effectiveDate, context)
+            res = @real_java_api.add_entitlement(bundleId, spec, overrides, effectiveDate, properties, context)
             # conversion for res [type = org.killbill.billing.entitlement.api.Entitlement]
             res = Killbill::Plugin::Model::Entitlement.new.to_ruby(res) unless res.nil?
             return res
@@ -144,8 +162,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::void pause(Java::java.util.UUID, Java::org.joda.time.LocalDate, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def pause(bundleId, effectiveDate, context)
+        java_signature 'Java::void pause(Java::java.util.UUID, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def pause(bundleId, effectiveDate, properties, context)
 
           # conversion for bundleId [type = java.util.UUID]
           bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
@@ -155,13 +173,22 @@ module Killbill
             effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
           end
 
+          # 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.CallContext]
           context = context.to_java unless context.nil?
-          @real_java_api.pause(bundleId, effectiveDate, context)
+          @real_java_api.pause(bundleId, effectiveDate, properties, context)
         end
 
-        java_signature 'Java::void resume(Java::java.util.UUID, Java::org.joda.time.LocalDate, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def resume(bundleId, effectiveDate, context)
+        java_signature 'Java::void resume(Java::java.util.UUID, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def resume(bundleId, effectiveDate, properties, context)
 
           # conversion for bundleId [type = java.util.UUID]
           bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
@@ -171,9 +198,18 @@ module Killbill
             effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
           end
 
+          # 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.CallContext]
           context = context.to_java unless context.nil?
-          @real_java_api.resume(bundleId, effectiveDate, context)
+          @real_java_api.resume(bundleId, effectiveDate, properties, context)
         end
 
         java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement getEntitlementForId(Java::java.util.UUID, Java::org.killbill.billing.util.callcontext.TenantContext)'
@@ -269,8 +305,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::java.util.UUID transferEntitlements(Java::java.util.UUID, Java::java.util.UUID, Java::java.lang.String, Java::org.joda.time.LocalDate, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def transfer_entitlements(sourceAccountId, destAccountId, externalKey, effectiveDate, context)
+        java_signature 'Java::java.util.UUID transferEntitlements(Java::java.util.UUID, Java::java.util.UUID, Java::java.lang.String, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def transfer_entitlements(sourceAccountId, destAccountId, externalKey, effectiveDate, properties, context)
 
           # conversion for sourceAccountId [type = java.util.UUID]
           sourceAccountId = java.util.UUID.fromString(sourceAccountId.to_s) unless sourceAccountId.nil?
@@ -286,10 +322,19 @@ module Killbill
             effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
           end
 
+          # 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.CallContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.transfer_entitlements(sourceAccountId, destAccountId, externalKey, effectiveDate, context)
+            res = @real_java_api.transfer_entitlements(sourceAccountId, destAccountId, externalKey, effectiveDate, properties, context)
             # conversion for res [type = java.util.UUID]
             res = res.nil? ? nil : res.to_s
             return res
@@ -298,8 +343,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::java.util.UUID transferEntitlementsOverrideBillingPolicy(Java::java.util.UUID, Java::java.util.UUID, Java::java.lang.String, Java::org.joda.time.LocalDate, Java::org.killbill.billing.catalog.api.BillingActionPolicy, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def transfer_entitlements_override_billing_policy(sourceAccountId, destAccountId, externalKey, effectiveDate, billingPolicy, context)
+        java_signature 'Java::java.util.UUID transferEntitlementsOverrideBillingPolicy(Java::java.util.UUID, Java::java.util.UUID, Java::java.lang.String, Java::org.joda.time.LocalDate, Java::org.killbill.billing.catalog.api.BillingActionPolicy, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def transfer_entitlements_override_billing_policy(sourceAccountId, destAccountId, externalKey, effectiveDate, billingPolicy, properties, context)
 
           # conversion for sourceAccountId [type = java.util.UUID]
           sourceAccountId = java.util.UUID.fromString(sourceAccountId.to_s) unless sourceAccountId.nil?
@@ -318,10 +363,19 @@ module Killbill
           # conversion for billingPolicy [type = org.killbill.billing.catalog.api.BillingActionPolicy]
           billingPolicy = Java::org.killbill.billing.catalog.api.BillingActionPolicy.value_of( billingPolicy.to_s ) unless billingPolicy.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 context [type = org.killbill.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.transfer_entitlements_override_billing_policy(sourceAccountId, destAccountId, externalKey, effectiveDate, billingPolicy, context)
+            res = @real_java_api.transfer_entitlements_override_billing_policy(sourceAccountId, destAccountId, externalKey, effectiveDate, billingPolicy, properties, context)
             # conversion for res [type = java.util.UUID]
             res = res.nil? ? nil : res.to_s
             return res