killbill 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82a09a7d410fc5aff99f49e2ff2b4426e8b951b7
-  data.tar.gz: db04bda5377c39f74d59c7315056a859754c59cd
+  metadata.gz: faaf0e82033d38d64c4d2b2485bc2dcaaf742ced
+  data.tar.gz: 2261f28500e2de1415d4bfef9362ad216b6555ce
 SHA512:
-  metadata.gz: a98a498e8a8260ef655e34b48d5e2abcca0d5817e58d45ed6e853405ae8679f27a8891b4491211fe42ab7744c3c27a5b81697c6a36bb1d761e4fc9f7c1918e8b
-  data.tar.gz: 963f49b07a89afaaeb6fc4b584da8c61dabb7fc49ad417de918607af92f0da705b2e685e763260e3589bd1e94e2cda140463a452ab643a5fe6c544b069ca5172
+  metadata.gz: db84c65123b4b468eddf817bdade8754adc39ff1086f42b93d54e2353025faa6e7e911fc053b675886ffd6b7a17cccef94d3f364712554060a576193dbd98ae9
+  data.tar.gz: b453cd617a78cbb27987c15be256b30da157c602979c0856fe1d560dc1acab4b43beaf298c4ac5f28284aedaaaf9f29f63355b7833d7ecc00b20942cb0057429

data/Jarfile

@@ -1,6 +1,8 @@
-jar 'org.kill-bill.billing:killbill-api', '0.9.5'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.7.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.7.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.7.2'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.11.2'
+jar 'org.kill-bill.billing:killbill-api', '0.9.6'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-retry', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.7.4'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.11.3'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/NEWS

@@ -1,3 +1,6 @@
+3.1.4
+    Updates to support killbill-api 0.9.6 and killbill-plugin-api 0.7.4
+
 3.1.3
     Minor change for non multi tenant environment
 

data/README.md

@@ -56,43 +56,55 @@ How to write a Payment plugin
         puts "MyPaymentPlugin plugin started"
       end
 
-      def process_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount, currency, context)
+      def authorize_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
       end
 
-      def get_payment_info(kb_account_id, kb_payment_id, context)
+      def capture_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
       end
 
-      def search_payments(search_key, offset, limit, context)
+      def purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
       end
 
-      def process_refund(kb_account_id, kb_payment_id, refund_amount, currency, context)
+      def void_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context)
       end
 
-      def get_refund_info(kb_account_id, kb_payment_id, context)
+      def credit_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
       end
 
-      def search_refunds(search_key, offset, limit, context)
+      def refund_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
       end
 
-      def add_payment_method(kb_account_id, kb_payment_method_id, payment_method_props, set_default, context)
+      def get_payment_info(kb_account_id, kb_payment_id, properties, context)
       end
 
-      def delete_payment_method(kb_account_id, kb_payment_method_id, context)
+      def search_payments(search_key, offset, limit, properties, context)
       end
 
-      def get_payment_method_detail(kb_account_id, kb_payment_method_id, context)
+      def add_payment_method(kb_account_id, kb_payment_method_id, payment_method_props, set_default, properties, context)
       end
 
-      def set_default_payment_method(kb_account_id, kb_payment_method_id, context)
+      def delete_payment_method(kb_account_id, kb_payment_method_id, properties, context)
       end
 
-      def get_payment_methods(kb_account_id, refresh_from_gateway, context)
+      def get_payment_method_detail(kb_account_id, kb_payment_method_id, properties, context)
       end
 
-      def search_payment_methods(search_key, offset, limit, context)
+      def set_default_payment_method(kb_account_id, kb_payment_method_id, properties, context)
       end
 
-      def reset_payment_methods(kb_account_id, payment_methods)
+      def get_payment_methods(kb_account_id, refresh_from_gateway, properties, context)
+      end
+
+      def search_payment_methods(search_key, offset, limit, properties, context)
+      end
+
+      def reset_payment_methods(kb_account_id, payment_methods, properties, context)
+      end
+
+      def build_form_descriptor(kb_account_id, descriptor_fields, properties, context)
+      end
+
+      def process_notification(notification, properties, context)
       end
 
       # Overriding this method is optional, only if you need to do some tear down work
@@ -124,13 +136,17 @@ This will generate a tree of files ready to be plugged into Kill Bill. To packag
 
 Most of the work consists of filling in the blank in `api.rb` (payment plugin API for ActiveMerchant gateways) and `application.rb` (sinatra application for ActiveMerchant integrations). Check the [Stripe plugin](https://github.com/killbill/killbill-stripe-plugin) for an example.
 
+In case the templates behind the generator change and you want to upgrade your plugin, you can re-run the above
+generate command on top of your existing code. For each file, you'll be prompted whether you want to overwrite it, show a
+diff, etc.
+
 
 How to expose HTTP endpoints
 ----------------------------
 
 Killbill exports a Rack handler that interfaces directly with the container in which killbill-server runs (e.g. Jetty).
 
-This basically means that Killbill will understand native Rack config.ru files placed in the root of your plugin, e.g. (using Sinatra): 
+This basically means that Killbill will understand native Rack config.ru files placed in the root of your plugin, e.g. (using Sinatra):
 
     require 'sinatra'
 
@@ -168,7 +184,15 @@ To build the artifacts into pkg/:
     # The <plugin_name>-<plugin-version>/ directory is used as a staging directory
     rake killbill:package
 
+For quick testing of your plugin, you can use the `deploy` task:
 
-In case the templates behind the generator change and you want to upgrade your plugin, you can re-run the above
-command on top of your existing code. For each file, you'll be prompted whether you want to overwrite it, show a
-diff, etc.
+    # Deploy the plugin in /var/tmp/bundles
+    rake killbill:deploy
+    # Deploy the plugin and clobber a previous version if needed
+    rake killbill:deploy[true]
+    # You can also specify a custom plugins directory as such
+    rake killbill:deploy[false,/path/to/bundles]
+
+To debug packaging issues, pass `true` as the third (optional) parameter:
+
+    rake killbill:deploy[false,/path/to/bundles,true]

data/VERSION

@@ -1 +1 @@
-3.1.3
+3.1.4

data/generators/active_merchant/templates/Jarfile.rb

@@ -1,6 +1,8 @@
-jar 'org.kill-bill.billing:killbill-api', '0.9.5'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.7.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.7.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.7.2'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.11.2'
+jar 'org.kill-bill.billing:killbill-api', '0.9.6'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-retry', '0.7.4'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.7.4'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.11.3'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

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

@@ -7,7 +7,7 @@
   :database: test.db
 # For MySQL
 #  :adapter: 'jdbc'
-#  :username: 'your-username'
-#  :password: 'your-password'
+#  :username: 'killbill'
+#  :password: 'killbill'
 #  :driver: 'com.mysql.jdbc.Driver'
-#  :url: 'jdbc:mysql://127.0.0.1:3306/your-database'
+#  :url: 'jdbc:mysql://127.0.0.1:3306/killbill'

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

@@ -35,6 +35,8 @@ CREATE TABLE `<%= identifier %>_transactions` (
   `<%= 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,
   `txn_id` varchar(255) NOT NULL,
   `amount_in_cents` int(11) NOT NULL,
   `currency` varchar(255) NOT NULL,
@@ -50,6 +52,8 @@ 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,
   `message` varchar(255) DEFAULT NULL,
   `authorization` varchar(255) DEFAULT NULL,
   `fraud_review` tinyint(1) DEFAULT NULL,

data/generators/active_merchant/templates/db/schema.rb

@@ -36,6 +36,8 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
     t.integer  "<%= identifier %>_response_id",  :null => false
     t.string   "api_call",                       :null => false
     t.string   "kb_payment_id",                  :null => false
+    t.string   "kb_payment_transaction_id",      :null => false
+    t.string   "transaction_type",               :null => false
     t.string   "txn_id"                          # <%= identifier %> transaction id
     t.integer  "amount_in_cents",                :null => false
     t.string   "currency",                       :null => false
@@ -50,6 +52,8 @@ ActiveRecord::Schema.define(:version => 20140410153635) do
   create_table "<%= identifier %>_responses", :force => true do |t|
     t.string   "api_call",          :null => false
     t.string   "kb_payment_id"
+    t.string   "kb_payment_transaction_id"
+    t.string   "transaction_type"
     t.string   "message"
     t.string   "authorization"
     t.boolean  "fraud_review"

data/generators/active_merchant/templates/lib/api.rb

@@ -15,60 +15,68 @@ module Killbill #:nodoc:
               ::Killbill::<%= class_name %>::<%= class_name %>Response)
       end
 
-      def authorize_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount, currency, properties, context)
+      def authorize_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
         # Pass extra parameters for the gateway here
         options = {}
 
         properties = merge_properties(properties, options)
-        super(kb_account_id, kb_payment_id, kb_payment_method_id, amount, currency, properties, context)
+        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
       end
 
-      def capture_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount, currency, properties, context)
+      def capture_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
         # Pass extra parameters for the gateway here
         options = {}
 
         properties = merge_properties(properties, options)
-        super(kb_account_id, kb_payment_id, kb_payment_method_id, amount, currency, properties, context)
+        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
       end
 
-      def void_payment(kb_account_id, kb_payment_id, kb_payment_method_id, properties, context)
+      def purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
         # Pass extra parameters for the gateway here
         options = {}
 
         properties = merge_properties(properties, options)
-        super(kb_account_id, kb_payment_id, kb_payment_method_id, properties, context)
+        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
       end
 
-      def process_payment(kb_account_id, kb_payment_id, kb_payment_method_id, amount, currency, properties, context)
+      def void_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context)
         # Pass extra parameters for the gateway here
         options = {}
 
         properties = merge_properties(properties, options)
-        super(kb_account_id, kb_payment_id, kb_payment_method_id, amount, currency, properties, context)
+        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context)
       end
 
-      def get_payment_info(kb_account_id, kb_payment_id, properties, context)
-        super
-      end
+      def credit_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+        # Pass extra parameters for the gateway here
+        options = {}
 
-      def search_payments(search_key, offset, limit, properties, context)
-        super
+        properties = merge_properties(properties, options)
+        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
       end
 
-      def process_refund(kb_account_id, kb_payment_id, refund_amount, currency, properties, context)
+      def refund_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
         # Pass extra parameters for the gateway here
         options = {}
 
         properties = merge_properties(properties, options)
-        super(kb_account_id, kb_payment_id, refund_amount, currency, properties, context)
+        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
       end
 
-      def get_refund_info(kb_account_id, kb_payment_id, properties, context)
-        super
+      def get_payment_info(kb_account_id, kb_payment_id, properties, context)
+        # Pass extra parameters for the gateway here
+        options = {}
+
+        properties = merge_properties(properties, options)
+        super(kb_account_id, kb_payment_id, properties, context)
       end
 
-      def search_refunds(search_key, offset, limit, properties, context)
-        super
+      def search_payments(search_key, offset, limit, properties, context)
+        # Pass extra parameters for the gateway here
+        options = {}
+
+        properties = merge_properties(properties, options)
+        super(search_key, offset, limit, properties, context)
       end
 
       def add_payment_method(kb_account_id, kb_payment_method_id, payment_method_props, set_default, properties, context)
@@ -88,7 +96,11 @@ module Killbill #:nodoc:
       end
 
       def get_payment_method_detail(kb_account_id, kb_payment_method_id, properties, context)
-        super
+        # Pass extra parameters for the gateway here
+        options = {}
+
+        properties = merge_properties(properties, options)
+        super(kb_account_id, kb_payment_method_id, properties, context)
       end
 
       def set_default_payment_method(kb_account_id, kb_payment_method_id, properties, context)
@@ -96,11 +108,19 @@ module Killbill #:nodoc:
       end
 
       def get_payment_methods(kb_account_id, refresh_from_gateway, properties, context)
-        super
+        # Pass extra parameters for the gateway here
+        options = {}
+
+        properties = merge_properties(properties, options)
+        super(kb_account_id, refresh_from_gateway, properties, context)
       end
 
       def search_payment_methods(search_key, offset, limit, properties, context)
-        super
+        # Pass extra parameters for the gateway here
+        options = {}
+
+        properties = merge_properties(properties, options)
+        super(search_key, offset, limit, properties, context)
       end
 
       def reset_payment_methods(kb_account_id, payment_methods, properties, context)

data/generators/active_merchant/templates/lib/models/response.rb

@@ -6,10 +6,12 @@ module Killbill #:nodoc:
 
       has_one :<%= identifier %>_transaction
 
-      def self.from_response(api_call, kb_account_id, kb_payment_id, kb_tenant_id, response, extra_params = {})
+      def self.from_response(api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, kb_tenant_id, response, extra_params = {})
         super(api_call,
               kb_account_id,
               kb_payment_id,
+              kb_payment_transaction_id,
+              transaction_type,
               kb_tenant_id,
               response,
               {

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

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 3.1.2'
+  s.add_dependency 'killbill', '~> 3.1.4'
   s.add_dependency 'activemerchant', '~> 1.42.9'
   s.add_dependency 'activerecord', '~> 4.1.0'
   s.add_dependency 'actionpack', '~> 4.1.0'

data/lib/killbill.rb

@@ -24,15 +24,18 @@ begin
   IMPORT_KILLBILL_APIS = %w(
     org.killbill.billing.account.api.AccountUserApi
     org.killbill.billing.catalog.api.CatalogUserApi
-    org.killbill.billing.invoice.api.InvoicePaymentApi
+    org.killbill.billing.currency.api.CurrencyConversionApi
     org.killbill.billing.entitlement.api.EntitlementApi
     org.killbill.billing.entitlement.api.SubscriptionApi
+    org.killbill.billing.invoice.api.InvoicePaymentApi
     org.killbill.billing.invoice.api.InvoiceUserApi
-    org.killbill.billing.overdue.OverdueUserApi
-    org.killbill.billing.payment.api.PaymentApi
+    org.killbill.billing.payment.api.DirectPaymentApi
+    org.killbill.billing.payment.api.PaymentGatewayApi
+    org.killbill.billing.tenant.api.TenantUserApi
+    org.killbill.billing.usage.api.UsageUserApi
+    org.killbill.billing.util.api.AuditUserApi
     org.killbill.billing.util.api.CustomFieldUserApi
     org.killbill.billing.util.api.TagUserApi
-    org.killbill.billing.currency.api.CurrencyConversionApi
     javax.servlet.http.HttpServlet
   )
 

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

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

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

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

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

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #
@@ -32,7 +33,7 @@ module Killbill
 
         include org.killbill.billing.util.audit.AccountAuditLogs
 
-        attr_accessor :audit_logs_for_account, :audit_logs_for_bundle, :audit_logs_for_subscription, :audit_logs_for_subscription_event, :audit_logs_for_blocking_state, :audit_logs_for_invoice, :audit_logs_for_invoice_item, :audit_logs_for_invoice_payment, :audit_logs_for_payment, :audit_logs_for_direct_payment, :audit_logs_for_direct_payment_transaction, :audit_logs_for_payment_method, :audit_logs_for_refund, :audit_logs_for_chargeback, :audit_logs_for_tag, :audit_logs_for_custom_field, :audit_logs
+        attr_accessor :audit_logs_for_account, :audit_logs_for_bundle, :audit_logs_for_subscription, :audit_logs_for_subscription_event, :audit_logs_for_blocking_state, :audit_logs_for_invoice, :audit_logs_for_invoice_item, :audit_logs_for_invoice_payment, :audit_logs_for_payment, :audit_logs_for_payment_transaction, :audit_logs_for_payment_method, :audit_logs_for_tag, :audit_logs_for_custom_field, :audit_logs
 
         def initialize()
         end
@@ -119,23 +120,14 @@ module Killbill
           end
           @audit_logs_for_payment = tmp
 
-          # conversion for audit_logs_for_direct_payment [type = java.util.List]
+          # conversion for audit_logs_for_payment_transaction [type = java.util.List]
           tmp = java.util.ArrayList.new
-          (@audit_logs_for_direct_payment || []).each do |m|
+          (@audit_logs_for_payment_transaction || []).each do |m|
             # conversion for m [type = org.killbill.billing.util.audit.AuditLog]
             m = m.to_java unless m.nil?
             tmp.add(m)
           end
-          @audit_logs_for_direct_payment = tmp
-
-          # conversion for audit_logs_for_direct_payment_transaction [type = java.util.List]
-          tmp = java.util.ArrayList.new
-          (@audit_logs_for_direct_payment_transaction || []).each do |m|
-            # conversion for m [type = org.killbill.billing.util.audit.AuditLog]
-            m = m.to_java unless m.nil?
-            tmp.add(m)
-          end
-          @audit_logs_for_direct_payment_transaction = tmp
+          @audit_logs_for_payment_transaction = tmp
 
           # conversion for audit_logs_for_payment_method [type = java.util.List]
           tmp = java.util.ArrayList.new
@@ -146,24 +138,6 @@ module Killbill
           end
           @audit_logs_for_payment_method = tmp
 
-          # conversion for audit_logs_for_refund [type = java.util.List]
-          tmp = java.util.ArrayList.new
-          (@audit_logs_for_refund || []).each do |m|
-            # conversion for m [type = org.killbill.billing.util.audit.AuditLog]
-            m = m.to_java unless m.nil?
-            tmp.add(m)
-          end
-          @audit_logs_for_refund = tmp
-
-          # conversion for audit_logs_for_chargeback [type = java.util.List]
-          tmp = java.util.ArrayList.new
-          (@audit_logs_for_chargeback || []).each do |m|
-            # conversion for m [type = org.killbill.billing.util.audit.AuditLog]
-            m = m.to_java unless m.nil?
-            tmp.add(m)
-          end
-          @audit_logs_for_chargeback = tmp
-
           # conversion for audit_logs_for_tag [type = java.util.List]
           tmp = java.util.ArrayList.new
           (@audit_logs_for_tag || []).each do |m|
@@ -278,25 +252,15 @@ module Killbill
           end
           @audit_logs_for_payment = tmp
 
-          # conversion for audit_logs_for_direct_payment [type = java.util.List]
-          @audit_logs_for_direct_payment = j_obj.audit_logs_for_direct_payment
+          # conversion for audit_logs_for_payment_transaction [type = java.util.List]
+          @audit_logs_for_payment_transaction = j_obj.audit_logs_for_payment_transaction
           tmp = []
-          (@audit_logs_for_direct_payment || []).each do |m|
+          (@audit_logs_for_payment_transaction || []).each do |m|
             # conversion for m [type = org.killbill.billing.util.audit.AuditLog]
             m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
             tmp << m
           end
-          @audit_logs_for_direct_payment = tmp
-
-          # conversion for audit_logs_for_direct_payment_transaction [type = java.util.List]
-          @audit_logs_for_direct_payment_transaction = j_obj.audit_logs_for_direct_payment_transaction
-          tmp = []
-          (@audit_logs_for_direct_payment_transaction || []).each do |m|
-            # conversion for m [type = org.killbill.billing.util.audit.AuditLog]
-            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
-            tmp << m
-          end
-          @audit_logs_for_direct_payment_transaction = tmp
+          @audit_logs_for_payment_transaction = tmp
 
           # conversion for audit_logs_for_payment_method [type = java.util.List]
           @audit_logs_for_payment_method = j_obj.audit_logs_for_payment_method
@@ -308,26 +272,6 @@ module Killbill
           end
           @audit_logs_for_payment_method = tmp
 
-          # conversion for audit_logs_for_refund [type = java.util.List]
-          @audit_logs_for_refund = j_obj.audit_logs_for_refund
-          tmp = []
-          (@audit_logs_for_refund || []).each do |m|
-            # conversion for m [type = org.killbill.billing.util.audit.AuditLog]
-            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
-            tmp << m
-          end
-          @audit_logs_for_refund = tmp
-
-          # conversion for audit_logs_for_chargeback [type = java.util.List]
-          @audit_logs_for_chargeback = j_obj.audit_logs_for_chargeback
-          tmp = []
-          (@audit_logs_for_chargeback || []).each do |m|
-            # conversion for m [type = org.killbill.billing.util.audit.AuditLog]
-            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
-            tmp << m
-          end
-          @audit_logs_for_chargeback = tmp
-
           # conversion for audit_logs_for_tag [type = java.util.List]
           @audit_logs_for_tag = j_obj.audit_logs_for_tag
           tmp = []