killbill 8.3.6 → 9.2.0

data/lib/killbill/gen/plugin-api/subscription_metadata.rb

@@ -32,7 +32,7 @@ module Killbill
       class SubscriptionMetadata
 
 
-        attr_accessor :action_type
+        attr_accessor :action_type, :bundle_external_key
 
         def initialize()
         end
@@ -40,13 +40,19 @@ module Killbill
         def to_java()
           # conversion for action_type [type = org.killbill.billing.notification.plugin.api.ActionType]
           @action_type = Java::org.killbill.billing.notification.plugin.api.ActionType.value_of( @action_type.to_s ) unless @action_type.nil?
-          Java::org.killbill.billing.notification.plugin.api.SubscriptionMetadata.new(@action_type)
+
+          # conversion for bundle_external_key [type = java.lang.String]
+          @bundle_external_key = @bundle_external_key.to_s unless @bundle_external_key.nil?
+          Java::org.killbill.billing.notification.plugin.api.SubscriptionMetadata.new(@action_type, @bundle_external_key)
         end
 
         def to_ruby(j_obj)
           # conversion for action_type [type = org.killbill.billing.notification.plugin.api.ActionType]
           @action_type = j_obj.action_type
           @action_type = @action_type.to_s.to_sym unless @action_type.nil?
+
+          # conversion for bundle_external_key [type = java.lang.String]
+          @bundle_external_key = j_obj.bundle_external_key
           self
         end
 

data/lib/killbill/gen/plugin-api/versioned_plugin_catalog.rb

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.catalog.plugin.api.VersionedPluginCatalog
 
-        attr_accessor :catalog_name, :recurring_billing_mode, :standalone_plugin_catalogs
+        attr_accessor :catalog_name, :standalone_plugin_catalogs
 
         def initialize()
         end
@@ -43,9 +43,6 @@ module Killbill
           # conversion for catalog_name [type = java.lang.String]
           @catalog_name = @catalog_name.to_s unless @catalog_name.nil?
 
-          # conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
-          @recurring_billing_mode = Java::org.killbill.billing.catalog.api.BillingMode.value_of( @recurring_billing_mode.to_s ) unless @recurring_billing_mode.nil?
-
           # conversion for standalone_plugin_catalogs [type = java.lang.Iterable]
           tmp = java.util.ArrayList.new
           (@standalone_plugin_catalogs || []).each do |m|
@@ -61,10 +58,6 @@ module Killbill
           # conversion for catalog_name [type = java.lang.String]
           @catalog_name = j_obj.catalog_name
 
-          # conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
-          @recurring_billing_mode = j_obj.recurring_billing_mode
-          @recurring_billing_mode = @recurring_billing_mode.to_s.to_sym unless @recurring_billing_mode.nil?
-
           # conversion for standalone_plugin_catalogs [type = java.lang.Iterable]
           @standalone_plugin_catalogs = j_obj.standalone_plugin_catalogs
           tmp = []

data/lib/killbill/helpers/active_merchant/active_record/models/response.rb

@@ -22,7 +22,6 @@ module Killbill
             # But regardless, for performance reasons, we want to set these timestamps ourselves
             # See ActiveRecord::Timestamp
             current_time = Time.now.utc
-            remove_sensitive_data_and_compact(extra_params)
             model.new({
                           :api_call                     => api_call,
                           :kb_account_id                => kb_account_id,
@@ -44,7 +43,7 @@ module Killbill
                           :success                      => response.success?,
                           :created_at                   => current_time,
                           :updated_at                   => current_time
-                      }.merge!(extra_params))
+                      }.merge!(extra_params.compact)) # Don't override with nil values
           end
 
           def self.create_response_and_transaction(identifier, transaction_model, api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, payment_processor_account_id, kb_tenant_id, gw_response, amount_in_cents, currency, extra_params = {}, model = Response)
@@ -160,9 +159,9 @@ module Killbill
           def self.search_where_clause(t, search_key)
             # Exact matches only
             where_clause = t[:kb_payment_id].eq(search_key)
-                                            .or(t[:kb_payment_transaction_id].eq(search_key))
-                                            .or(t[:message].eq(search_key))
-                                            .or(t[:authorization].eq(search_key))
+                       .or(t[:kb_payment_transaction_id].eq(search_key))
+                       .or(t[:message].eq(search_key))
+                       .or(t[:authorization].eq(search_key))
 
             # Only search successful payments and refunds
             where_clause = where_clause.and(t[:success].eq(true))
@@ -198,7 +197,7 @@ module Killbill
             pagination                  = ::Killbill::Plugin::Model::Pagination.new
             pagination.current_offset   = offset
             pagination.total_nb_records = self.count_by_sql(self.search_query(search_key, kb_tenant_id))
-            pagination.max_nb_records   = self.max_nb_records
+            pagination.max_nb_records   = self.where(:success => true).count
             pagination.next_offset      = (!pagination.total_nb_records.nil? && offset + limit >= pagination.total_nb_records) ? nil : offset + limit
             # Reduce the limit if the specified value is larger than the number of records
             actual_limit                = [pagination.max_nb_records, limit].min
@@ -208,20 +207,6 @@ module Killbill
             pagination
           end
 
-          def self.remove_sensitive_data_and_compact(extra_params)
-            extra_params.compact!
-            extra_params.delete_if { |k, _| sensitive_fields.include?(k) }
-          end
-
-          # Override in your plugin if needed
-          def self.sensitive_fields
-            []
-          end
-
-          def self.max_nb_records
-            self.where(:success => true).count
-          end
-
           # Override in your plugin if needed
           def txn_id
             authorization
@@ -304,4 +289,4 @@ module Killbill
       end
     end
   end
-end
+end

data/lib/killbill/helpers/active_merchant/killbill_spec_helper.rb

@@ -41,7 +41,7 @@ module Killbill
           cc_last_name = (overrides.delete(:cc_last_name) || (set_defaults ? 'Doe' : nil))
           cc_type = (overrides.delete(:cc_type) || (set_defaults ? 'Visa' : nil))
           cc_exp_month = (overrides.delete(:cc_exp_month) || (set_defaults ? 12 : nil))
-          cc_exp_year = (overrides.delete(:cc_exp_year) || (set_defaults ? 2020 : nil))
+          cc_exp_year = (overrides.delete(:cc_exp_year) || (set_defaults ? 2017 : nil))
           cc_last_4 = (overrides.delete(:cc_last_4) || (set_defaults ? 4242 : nil))
           address1 = (overrides.delete(:address1) || (set_defaults ? '5, oakriu road' : nil))
           address2 = (overrides.delete(:address2) || (set_defaults ? 'apt. 298' : nil))

data/lib/killbill/helpers/active_merchant/payment_plugin.rb

@@ -49,15 +49,15 @@ module Killbill
           end
         end
 
-        def authorize_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, extra_params = {})
+        def authorize_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
           gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
             gateway.authorize(amount_in_cents, payment_source, options)
           end
 
-          dispatch_to_gateways(:authorize, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, nil, extra_params)
+          dispatch_to_gateways(:authorize, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc)
         end
 
-        def capture_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, extra_params = {})
+        def capture_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
           gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
             gateway.capture(amount_in_cents, linked_transaction.txn_id, options)
           end
@@ -69,18 +69,18 @@ module Killbill
             last_authorization
           end
 
-          dispatch_to_gateways(:capture, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, linked_transaction_proc, extra_params)
+          dispatch_to_gateways(:capture, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, linked_transaction_proc)
         end
 
-        def purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, extra_params = {})
+        def purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
           gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
             gateway.purchase(amount_in_cents, payment_source, options)
           end
 
-          dispatch_to_gateways(:purchase, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, nil, extra_params)
+          dispatch_to_gateways(:purchase, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc)
         end
 
-        def void_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context, extra_params = {})
+        def void_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context)
           gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
             authorization = linked_transaction.txn_id
 
@@ -99,18 +99,18 @@ module Killbill
             @transaction_model.find_candidate_transaction_for_void(kb_payment_id, context.tenant_id, linked_transaction_type)
           end
 
-          dispatch_to_gateways(:void, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, nil, nil, properties, context, gateway_call_proc, linked_transaction_proc, extra_params)
+          dispatch_to_gateways(:void, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, nil, nil, properties, context, gateway_call_proc, linked_transaction_proc)
         end
 
-        def credit_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, extra_params = {})
+        def credit_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
           gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
             gateway.credit(amount_in_cents, payment_source, options)
           end
 
-          dispatch_to_gateways(:credit, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, nil, extra_params)
+          dispatch_to_gateways(:credit, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc)
         end
 
-        def refund_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, extra_params = {})
+        def refund_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
           gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
             gateway.refund(amount_in_cents, linked_transaction.txn_id, options)
           end
@@ -123,7 +123,7 @@ module Killbill
             transaction
           end
 
-          dispatch_to_gateways(:refund, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, linked_transaction_proc, extra_params)
+          dispatch_to_gateways(:refund, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, linked_transaction_proc)
         end
 
         def get_payment_info(kb_account_id, kb_payment_id, properties, context)

data/lib/killbill/version.rb

@@ -1,3 +1,3 @@
 module Killbill
-  VERSION = '8.3.6'
+  VERSION = '9.2.0'
 end

data/spec/killbill/helpers/response_spec.rb

@@ -135,13 +135,6 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::Response do
     ::Killbill::Test::TestResponse.from_kb_payment_id(::Killbill::Test::TestTransaction, kb_payment_id3, kb_tenant_id).size == 0
   end
 
-  it 'should filter out sensitive parameter if specified' do
-    extra_params = {:email => "test.test", :payer_id => "test"}
-    ::Killbill::Test::TestResponse.send(:remove_sensitive_data_and_compact, extra_params)
-    extra_params[:email].should be_nil
-    extra_params[:payer_id].should == "test"
-  end
-
   it 'should generate the right SQL query' do
     # Check count query (search query numeric)
     expected_query = "SELECT COUNT(DISTINCT #{q('test_responses')}.#{q('id')}) FROM #{q('test_responses')}  WHERE (((#{q('test_responses')}.#{q('kb_payment_id')} = '1234' OR #{q('test_responses')}.#{q('kb_payment_transaction_id')} = '1234') OR #{q('test_responses')}.#{q('message')} = '1234') OR #{q('test_responses')}.#{q('authorization')} = '1234') AND #{q('test_responses')}.#{q('success')} = #{qtrue} AND #{q('test_responses')}.#{q('kb_tenant_id')} = '11-22-33'"

data/spec/killbill/helpers/test_response.rb

@@ -6,10 +6,6 @@ module Killbill #:nodoc:
 
       has_one :test_transaction
 
-      def self.sensitive_fields
-        [:email]
-      end
-
     end
   end
 end

data/spec/killbill/killbillapi_spec.rb

@@ -19,6 +19,7 @@ describe Killbill::Plugin do
     @account.locale="locale"
     @account.address1="address1"
     @account.time_zone=:UTC
+    @account.reference_time=DateTime.now
     @account.city="San Francisco"
 
     @context = @kb_apis.create_context

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 8.3.6
+  version: 9.2.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -317,8 +317,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.head
 - Gemfile.lock
@@ -380,6 +380,7 @@ files:
 - lib/killbill/gen/api/base_entitlement_with_add_ons_specifier.rb
 - lib/killbill/gen/api/billing_exception_base.rb
 - lib/killbill/gen/api/block.rb
+- lib/killbill/gen/api/block_price_override.rb
 - lib/killbill/gen/api/blockable.rb
 - lib/killbill/gen/api/blocking_api_exception.rb
 - lib/killbill/gen/api/blocking_state.rb
@@ -410,6 +411,7 @@ files:
 - lib/killbill/gen/api/default_node_command_metadata.rb
 - lib/killbill/gen/api/dry_run_arguments.rb
 - lib/killbill/gen/api/duration.rb
+- lib/killbill/gen/api/email_notification.rb
 - lib/killbill/gen/api/entitlement.rb
 - lib/killbill/gen/api/entitlement_ao_status_dry_run.rb
 - lib/killbill/gen/api/entitlement_api.rb
@@ -446,6 +448,12 @@ files:
 - lib/killbill/gen/api/node_info.rb
 - lib/killbill/gen/api/osgi_killbill.rb
 - lib/killbill/gen/api/osgi_plugin_properties.rb
+- lib/killbill/gen/api/overdue_api.rb
+- lib/killbill/gen/api/overdue_api_exception.rb
+- lib/killbill/gen/api/overdue_condition.rb
+- lib/killbill/gen/api/overdue_config.rb
+- lib/killbill/gen/api/overdue_state.rb
+- lib/killbill/gen/api/overdue_states_account.rb
 - lib/killbill/gen/api/pagination.rb
 - lib/killbill/gen/api/payment.rb
 - lib/killbill/gen/api/payment_api.rb
@@ -477,7 +485,6 @@ files:
 - lib/killbill/gen/api/rate.rb
 - lib/killbill/gen/api/record_id_api.rb
 - lib/killbill/gen/api/recurring.rb
-- lib/killbill/gen/api/refund.rb
 - lib/killbill/gen/api/require_gen.rb
 - lib/killbill/gen/api/rolled_up_unit.rb
 - lib/killbill/gen/api/rolled_up_usage.rb
@@ -504,11 +511,14 @@ files:
 - lib/killbill/gen/api/tenant_kv.rb
 - lib/killbill/gen/api/tenant_user_api.rb
 - lib/killbill/gen/api/tier.rb
+- lib/killbill/gen/api/tier_price_override.rb
 - lib/killbill/gen/api/tiered_block.rb
+- lib/killbill/gen/api/tiered_block_price_override.rb
 - lib/killbill/gen/api/unit.rb
 - lib/killbill/gen/api/unit_usage_record.rb
 - lib/killbill/gen/api/usage.rb
 - lib/killbill/gen/api/usage_api_exception.rb
+- lib/killbill/gen/api/usage_price_override.rb
 - lib/killbill/gen/api/usage_record.rb
 - lib/killbill/gen/api/usage_user_api.rb
 - lib/killbill/gen/plugin-api/blocking_state_metadata.rb
@@ -522,8 +532,11 @@ files:
 - lib/killbill/gen/plugin-api/ext_bus_event.rb
 - lib/killbill/gen/plugin-api/gateway_notification.rb
 - lib/killbill/gen/plugin-api/hosted_payment_page_form_descriptor.rb
+- lib/killbill/gen/plugin-api/invoice_payment_metadata.rb
 - lib/killbill/gen/plugin-api/invoice_plugin_api.rb
+- lib/killbill/gen/plugin-api/invoice_plugin_api_retry_exception.rb
 - lib/killbill/gen/plugin-api/notification_plugin_api.rb
+- lib/killbill/gen/plugin-api/notification_plugin_api_retry_exception.rb
 - lib/killbill/gen/plugin-api/on_failure_entitlement_result.rb
 - lib/killbill/gen/plugin-api/on_failure_payment_control_result.rb
 - lib/killbill/gen/plugin-api/on_success_entitlement_result.rb

data/.circleci/config.yml

@@ -1,138 +0,0 @@
-defaults: &defaults
-  working_directory: ~/repo
-  environment:
-    JRUBY_OPTS: -J-Xmx1024M
-
-version: 2
-jobs:
-  build-jruby-1.7.26:
-    <<: *defaults
-    docker:
-      - image: killbill/kbbuild:0.5.0
-    steps:
-      - checkout
-      - restore_cache:
-          key: v4-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
-      - run:
-          name: Install gem dependencies
-          command: |
-            bundle install --jobs=4 --retry=3 --path=vendor/bundle
-            bundle exec jbundle install
-      - save_cache:
-          paths:
-            - ~/.m2
-            - .bundle
-            - .jbundler
-            - vendor/bundle
-          key: v4-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
-
-  test-mysql-jruby-1.7.26:
-    <<: *defaults
-    docker:
-      - image: killbill/kbbuild:0.5.0
-      - image: killbill/mariadb:0.19
-        environment:
-        - MYSQL_ROOT_PASSWORD=root
-    steps:
-      - checkout
-      - restore_cache:
-          key: v4-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
-      - run:
-          name: Setup DDL
-          command: |
-            set +e
-            count=0
-            until mysqladmin ping -h 127.0.0.1 -u root --password=root --silent; do
-              if [[ "$count" == "25" ]]; then
-                exit 1
-              fi
-              (( count++ ))
-              printf '.'
-              sleep 5
-            done
-            set -e
-            mysql -h 127.0.0.1 -u root --password=root -e 'create database killbill_test;'
-      - run:
-          name: Run tests
-          command: |
-            mkdir /tmp/test-results
-            AR_ADAPTER='mariadb' AR_USERNAME='root' AR_PASSWORD='' AR_DATABASE='killbill_test' bundle exec rake test:spec | tee /tmp/test-results/test.txt 2>&1
-            AR_ADAPTER='mariadb' AR_USERNAME='root' AR_PASSWORD='' AR_DATABASE='killbill_test' bundle exec rake test:remote:spec | tee /tmp/test-results/remote-test.txt 2>&1
-      - store_test_results:
-          path: /tmp/test-results
-      - store_artifacts:
-          path: /tmp/test-results
-          destination: test-results
-
-  test-postgresql-jruby-1.7.26:
-    <<: *defaults
-    docker:
-      - image: killbill/kbbuild:0.5.0
-      - image: killbill/postgresql:0.19
-        environment:
-        - POSTGRES_PASSWORD=postgres
-    steps:
-      - checkout
-      - restore_cache:
-          key: v4-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
-      - run:
-          name: Setup DDL
-          command: |
-            set +e
-            count=0
-            until $(psql -h 127.0.0.1 -U postgres -p 5432 -l > /dev/null); do
-              if [[ "$count" == "25" ]]; then
-                exit 1
-              fi
-              (( count++ ))
-              printf '.'
-              sleep 5
-            done
-            set -e
-            psql -h 127.0.0.1 -U postgres -p 5432 -c 'create database killbill_test;'
-      - run:
-          name: Run tests
-          command: |
-            mkdir /tmp/test-results
-            AR_ADAPTER='postgresql' AR_USERNAME='postgres' AR_DATABASE='killbill_test' bundle exec rake test:spec | tee /tmp/test-results/test.txt 2>&1
-            AR_ADAPTER='postgresql' AR_USERNAME='postgres' AR_DATABASE='killbill_test' bundle exec rake test:remote:spec | tee /tmp/test-results/remote-test.txt 2>&1
-      - store_test_results:
-          path: /tmp/test-results
-      - store_artifacts:
-          path: /tmp/test-results
-          destination: test-results
-
-  test-h2-jruby-1.7.26:
-    <<: *defaults
-    docker:
-      - image: killbill/kbbuild:0.5.0
-    steps:
-      - checkout
-      - restore_cache:
-          key: v4-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
-      - run:
-          name: Run tests
-          command: |
-            mkdir /tmp/test-results
-            AR_ADAPTER='sqlite3' AR_DATABASE='test.db' bundle exec rake test:spec | tee /tmp/test-results/test.txt 2>&1
-            AR_ADAPTER='sqlite3' AR_DATABASE='test.db' bundle exec rake test:remote:spec | tee /tmp/test-results/remote-test.txt 2>&1
-      - store_test_results:
-          path: /tmp/test-results
-      - store_artifacts:
-          path: /tmp/test-results
-          destination: test-results
-
-workflows:
-  version: 2
-  build-and-test:
-    jobs:
-      - build-jruby-1.7.26
-      #- test-mysql-jruby-1.7.26:
-      #    requires:
-      #      - build-jruby-1.7.26
-      - test-postgresql-jruby-1.7.26:
-          requires:
-            - build-jruby-1.7.26
-      - test-h2-jruby-1.7.26:
-          requires:
-            - build-jruby-1.7.26