killbill 7.0.6 → 8.0.0

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.entitlement.api.SubscriptionEvent
 
-        attr_accessor :id, :entitlement_id, :effective_date, :requested_date, :subscription_event_type, :is_blocked_billing, :is_blocked_entitlement, :service_name, :service_state_name, :prev_product, :prev_plan, :prev_phase, :prev_price_list, :prev_billing_period, :next_product, :next_plan, :next_phase, :next_price_list, :next_billing_period
+        attr_accessor :id, :entitlement_id, :effective_date, :subscription_event_type, :is_blocked_billing, :is_blocked_entitlement, :service_name, :service_state_name, :prev_product, :prev_plan, :prev_phase, :prev_price_list, :prev_billing_period, :next_product, :next_plan, :next_phase, :next_price_list, :next_billing_period
 
         def initialize()
         end
@@ -51,11 +51,6 @@ module Killbill
             @effective_date = Java::org.joda.time.LocalDate.parse(@effective_date.to_s)
           end
 
-          # conversion for requested_date [type = org.joda.time.LocalDate]
-          if !@requested_date.nil?
-            @requested_date = Java::org.joda.time.LocalDate.parse(@requested_date.to_s)
-          end
-
           # conversion for subscription_event_type [type = org.killbill.billing.entitlement.api.SubscriptionEventType]
           @subscription_event_type = Java::org.killbill.billing.entitlement.api.SubscriptionEventType.value_of( @subscription_event_type.to_s ) unless @subscription_event_type.nil?
 
@@ -118,12 +113,6 @@ module Killbill
             @effective_date = @effective_date.to_s
           end
 
-          # conversion for requested_date [type = org.joda.time.LocalDate]
-          @requested_date = j_obj.requested_date
-          if !@requested_date.nil?
-            @requested_date = @requested_date.to_s
-          end
-
           # conversion for subscription_event_type [type = org.killbill.billing.entitlement.api.SubscriptionEventType]
           @subscription_event_type = j_obj.subscription_event_type
           @subscription_event_type = @subscription_event_type.to_s.to_sym unless @subscription_event_type.nil?

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

@@ -32,7 +32,7 @@ module Killbill
       class SubscriptionUsageRecord
 
 
-        attr_accessor :subscription_id, :unit_usage_record
+        attr_accessor :subscription_id, :tracking_id, :unit_usage_record
 
         def initialize()
         end
@@ -41,6 +41,9 @@ module Killbill
           # conversion for subscription_id [type = java.util.UUID]
           @subscription_id = java.util.UUID.fromString(@subscription_id.to_s) unless @subscription_id.nil?
 
+          # conversion for tracking_id [type = java.lang.String]
+          @tracking_id = @tracking_id.to_s unless @tracking_id.nil?
+
           # conversion for unit_usage_record [type = java.util.List]
           tmp = java.util.ArrayList.new
           (@unit_usage_record || []).each do |m|
@@ -49,7 +52,7 @@ module Killbill
             tmp.add(m)
           end
           @unit_usage_record = tmp
-          Java::org.killbill.billing.usage.api.SubscriptionUsageRecord.new(@subscription_id, @unit_usage_record)
+          Java::org.killbill.billing.usage.api.SubscriptionUsageRecord.new(@subscription_id, @tracking_id, @unit_usage_record)
         end
 
         def to_ruby(j_obj)
@@ -57,6 +60,9 @@ module Killbill
           @subscription_id = j_obj.subscription_id
           @subscription_id = @subscription_id.nil? ? nil : @subscription_id.to_s
 
+          # conversion for tracking_id [type = java.lang.String]
+          @tracking_id = j_obj.tracking_id
+
           # conversion for unit_usage_record [type = java.util.List]
           @unit_usage_record = j_obj.unit_usage_record
           tmp = []

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

@@ -0,0 +1,68 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, Inc.                                            #
+#                   Copyright 2014 The Billing Project, LLC                                 #
+#                                                                                           #
+#      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                                       #
+#                                                                                           #
+#      Unless required by applicable law or agreed to in writing, software                  #
+#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
+#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
+#      License for the specific language governing permissions and limitations              #
+#      under the License.                                                                   #
+#                                                                                           #
+#############################################################################################
+
+
+#
+#                       DO NOT EDIT!!!
+#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
+#
+
+
+module Killbill
+  module Plugin
+    module Model
+
+      class UsageApiException
+
+
+        attr_accessor :message, :cause, :code
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for message [type = java.lang.String]
+          @message = @message.to_s unless @message.nil?
+
+          # conversion for cause [type = java.lang.Throwable]
+          @cause = @cause.to_s unless cause.nil?
+
+          # conversion for code [type = int]
+          @code = @code
+          Java::org.killbill.billing.usage.api.UsageApiException.new(@message, @cause, @code)
+        end
+
+        def to_ruby(j_obj)
+          # conversion for message [type = java.lang.String]
+          @message = j_obj.message
+
+          # conversion for cause [type = java.lang.Throwable]
+          @cause = j_obj.cause
+          @cause = @cause.to_s unless @cause.nil?
+
+          # conversion for code [type = int]
+          @code = j_obj.code
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,137 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, Inc.                                            #
+#                   Copyright 2014 The Billing Project, LLC                                 #
+#                                                                                           #
+#      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                                       #
+#                                                                                           #
+#      Unless required by applicable law or agreed to in writing, software                  #
+#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
+#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
+#      License for the specific language governing permissions and limitations              #
+#      under the License.                                                                   #
+#                                                                                           #
+#############################################################################################
+
+
+#
+#                       DO NOT EDIT!!!
+#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
+#
+
+
+module Killbill
+  module Plugin
+    module Model
+
+      class BlockingStateMetadata
+
+
+        attr_accessor :blockable_id, :service, :state_name, :blocking_type, :effective_date, :transitioned_to_blocked_billing, :transitioned_to_unblocked_billing, :transitioned_to_blocked_entitlement, :transitioned_to_unblocked_entitlement
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for blockable_id [type = java.util.UUID]
+          @blockable_id = java.util.UUID.fromString(@blockable_id.to_s) unless @blockable_id.nil?
+
+          # conversion for service [type = java.lang.String]
+          @service = @service.to_s unless @service.nil?
+
+          # conversion for state_name [type = java.lang.String]
+          @state_name = @state_name.to_s unless @state_name.nil?
+
+          # conversion for blocking_type [type = org.killbill.billing.entitlement.api.BlockingStateType]
+          @blocking_type = Java::org.killbill.billing.entitlement.api.BlockingStateType.value_of( @blocking_type.to_s ) unless @blocking_type.nil?
+
+          # conversion for effective_date [type = org.joda.time.DateTime]
+          if !@effective_date.nil?
+            @effective_date =  (@effective_date.kind_of? Time) ? DateTime.parse(@effective_date.to_s) : @effective_date
+            @effective_date = Java::org.joda.time.DateTime.new(@effective_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          end
+
+          # conversion for transitioned_to_blocked_billing [type = java.lang.Boolean]
+          @transitioned_to_blocked_billing = @transitioned_to_blocked_billing.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@transitioned_to_blocked_billing)
+
+          # conversion for transitioned_to_unblocked_billing [type = java.lang.Boolean]
+          @transitioned_to_unblocked_billing = @transitioned_to_unblocked_billing.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@transitioned_to_unblocked_billing)
+
+          # conversion for transitioned_to_blocked_entitlement [type = java.lang.Boolean]
+          @transitioned_to_blocked_entitlement = @transitioned_to_blocked_entitlement.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@transitioned_to_blocked_entitlement)
+
+          # conversion for transitioned_to_unblocked_entitlement [type = java.lang.Boolean]
+          @transitioned_to_unblocked_entitlement = @transitioned_to_unblocked_entitlement.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@transitioned_to_unblocked_entitlement)
+          Java::org.killbill.billing.notification.plugin.api.BlockingStateMetadata.new(@blockable_id, @service, @state_name, @blocking_type, @effective_date, @transitioned_to_blocked_billing, @transitioned_to_unblocked_billing, @transitioned_to_blocked_entitlement, @transitioned_to_unblocked_entitlement)
+        end
+
+        def to_ruby(j_obj)
+          # conversion for blockable_id [type = java.util.UUID]
+          @blockable_id = j_obj.blockable_id
+          @blockable_id = @blockable_id.nil? ? nil : @blockable_id.to_s
+
+          # conversion for service [type = java.lang.String]
+          @service = j_obj.service
+
+          # conversion for state_name [type = java.lang.String]
+          @state_name = j_obj.state_name
+
+          # conversion for blocking_type [type = org.killbill.billing.entitlement.api.BlockingStateType]
+          @blocking_type = j_obj.blocking_type
+          @blocking_type = @blocking_type.to_s.to_sym unless @blocking_type.nil?
+
+          # conversion for effective_date [type = org.joda.time.DateTime]
+          @effective_date = j_obj.effective_date
+          if !@effective_date.nil?
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
+            str = fmt.print(@effective_date)
+            @effective_date = DateTime.iso8601(str)
+          end
+
+          # conversion for transitioned_to_blocked_billing [type = java.lang.Boolean]
+          @transitioned_to_blocked_billing = j_obj.transitioned_to_blocked_billing
+          if @transitioned_to_blocked_billing.nil?
+            @transitioned_to_blocked_billing = false
+          else
+            tmp_bool = (@transitioned_to_blocked_billing.java_kind_of? java.lang.Boolean) ? @transitioned_to_blocked_billing.boolean_value : @transitioned_to_blocked_billing
+            @transitioned_to_blocked_billing = tmp_bool ? true : false
+          end
+
+          # conversion for transitioned_to_unblocked_billing [type = java.lang.Boolean]
+          @transitioned_to_unblocked_billing = j_obj.transitioned_to_unblocked_billing
+          if @transitioned_to_unblocked_billing.nil?
+            @transitioned_to_unblocked_billing = false
+          else
+            tmp_bool = (@transitioned_to_unblocked_billing.java_kind_of? java.lang.Boolean) ? @transitioned_to_unblocked_billing.boolean_value : @transitioned_to_unblocked_billing
+            @transitioned_to_unblocked_billing = tmp_bool ? true : false
+          end
+
+          # conversion for transitioned_to_blocked_entitlement [type = java.lang.Boolean]
+          @transitioned_to_blocked_entitlement = j_obj.transitioned_to_blocked_entitlement
+          if @transitioned_to_blocked_entitlement.nil?
+            @transitioned_to_blocked_entitlement = false
+          else
+            tmp_bool = (@transitioned_to_blocked_entitlement.java_kind_of? java.lang.Boolean) ? @transitioned_to_blocked_entitlement.boolean_value : @transitioned_to_blocked_entitlement
+            @transitioned_to_blocked_entitlement = tmp_bool ? true : false
+          end
+
+          # conversion for transitioned_to_unblocked_entitlement [type = java.lang.Boolean]
+          @transitioned_to_unblocked_entitlement = j_obj.transitioned_to_unblocked_entitlement
+          if @transitioned_to_unblocked_entitlement.nil?
+            @transitioned_to_unblocked_entitlement = false
+          else
+            tmp_bool = (@transitioned_to_unblocked_entitlement.java_kind_of? java.lang.Boolean) ? @transitioned_to_unblocked_entitlement.boolean_value : @transitioned_to_unblocked_entitlement
+            @transitioned_to_unblocked_entitlement = tmp_bool ? true : false
+          end
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.entitlement.plugin.api.EntitlementContext
 
-        attr_accessor :user_token, :user_name, :call_origin, :user_type, :reason_code, :comments, :created_date, :updated_date, :tenant_id, :operation_type, :account_id, :destination_account_id, :bundle_id, :external_key, :entitlement_specifiers, :effective_date, :plugin_properties
+        attr_accessor :user_token, :user_name, :call_origin, :user_type, :reason_code, :comments, :created_date, :updated_date, :tenant_id, :operation_type, :account_id, :destination_account_id, :bundle_id, :external_key, :entitlement_specifiers, :entitlement_effective_date, :billing_effective_date, :billing_action_policy, :plugin_properties
 
         def initialize()
         end
@@ -97,11 +97,19 @@ module Killbill
           end
           @entitlement_specifiers = tmp
 
-          # conversion for effective_date [type = org.joda.time.LocalDate]
-          if !@effective_date.nil?
-            @effective_date = Java::org.joda.time.LocalDate.parse(@effective_date.to_s)
+          # conversion for entitlement_effective_date [type = org.joda.time.LocalDate]
+          if !@entitlement_effective_date.nil?
+            @entitlement_effective_date = Java::org.joda.time.LocalDate.parse(@entitlement_effective_date.to_s)
           end
 
+          # conversion for billing_effective_date [type = org.joda.time.LocalDate]
+          if !@billing_effective_date.nil?
+            @billing_effective_date = Java::org.joda.time.LocalDate.parse(@billing_effective_date.to_s)
+          end
+
+          # conversion for billing_action_policy [type = org.killbill.billing.catalog.api.BillingActionPolicy]
+          @billing_action_policy = Java::org.killbill.billing.catalog.api.BillingActionPolicy.value_of( @billing_action_policy.to_s ) unless @billing_action_policy.nil?
+
           # conversion for plugin_properties [type = java.lang.Iterable]
           tmp = java.util.ArrayList.new
           (@plugin_properties || []).each do |m|
@@ -184,12 +192,22 @@ module Killbill
           end
           @entitlement_specifiers = tmp
 
-          # conversion for effective_date [type = org.joda.time.LocalDate]
-          @effective_date = j_obj.effective_date
-          if !@effective_date.nil?
-            @effective_date = @effective_date.to_s
+          # conversion for entitlement_effective_date [type = org.joda.time.LocalDate]
+          @entitlement_effective_date = j_obj.entitlement_effective_date
+          if !@entitlement_effective_date.nil?
+            @entitlement_effective_date = @entitlement_effective_date.to_s
           end
 
+          # conversion for billing_effective_date [type = org.joda.time.LocalDate]
+          @billing_effective_date = j_obj.billing_effective_date
+          if !@billing_effective_date.nil?
+            @billing_effective_date = @billing_effective_date.to_s
+          end
+
+          # conversion for billing_action_policy [type = org.killbill.billing.catalog.api.BillingActionPolicy]
+          @billing_action_policy = j_obj.billing_action_policy
+          @billing_action_policy = @billing_action_policy.to_s.to_sym unless @billing_action_policy.nil?
+
           # conversion for plugin_properties [type = java.lang.Iterable]
           @plugin_properties = j_obj.plugin_properties
           tmp = []

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.entitlement.plugin.api.PriorEntitlementResult
 
-        attr_accessor :is_aborted, :adjusted_effective_date, :adjusted_entitlement_specifiers, :adjusted_plugin_properties
+        attr_accessor :is_aborted, :adjusted_entitlement_effective_date, :adjusted_billing_effective_date, :adjusted_billing_action_policy, :adjusted_entitlement_specifiers, :adjusted_plugin_properties
 
         def initialize()
         end
@@ -43,11 +43,19 @@ module Killbill
           # conversion for is_aborted [type = boolean]
           @is_aborted = @is_aborted.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_aborted)
 
-          # conversion for adjusted_effective_date [type = org.joda.time.LocalDate]
-          if !@adjusted_effective_date.nil?
-            @adjusted_effective_date = Java::org.joda.time.LocalDate.parse(@adjusted_effective_date.to_s)
+          # conversion for adjusted_entitlement_effective_date [type = org.joda.time.LocalDate]
+          if !@adjusted_entitlement_effective_date.nil?
+            @adjusted_entitlement_effective_date = Java::org.joda.time.LocalDate.parse(@adjusted_entitlement_effective_date.to_s)
           end
 
+          # conversion for adjusted_billing_effective_date [type = org.joda.time.LocalDate]
+          if !@adjusted_billing_effective_date.nil?
+            @adjusted_billing_effective_date = Java::org.joda.time.LocalDate.parse(@adjusted_billing_effective_date.to_s)
+          end
+
+          # conversion for adjusted_billing_action_policy [type = org.killbill.billing.catalog.api.BillingActionPolicy]
+          @adjusted_billing_action_policy = Java::org.killbill.billing.catalog.api.BillingActionPolicy.value_of( @adjusted_billing_action_policy.to_s ) unless @adjusted_billing_action_policy.nil?
+
           # conversion for adjusted_entitlement_specifiers [type = java.util.List]
           tmp = java.util.ArrayList.new
           (@adjusted_entitlement_specifiers || []).each do |m|
@@ -78,12 +86,22 @@ module Killbill
             @is_aborted = tmp_bool ? true : false
           end
 
-          # conversion for adjusted_effective_date [type = org.joda.time.LocalDate]
-          @adjusted_effective_date = j_obj.adjusted_effective_date
-          if !@adjusted_effective_date.nil?
-            @adjusted_effective_date = @adjusted_effective_date.to_s
+          # conversion for adjusted_entitlement_effective_date [type = org.joda.time.LocalDate]
+          @adjusted_entitlement_effective_date = j_obj.adjusted_entitlement_effective_date
+          if !@adjusted_entitlement_effective_date.nil?
+            @adjusted_entitlement_effective_date = @adjusted_entitlement_effective_date.to_s
           end
 
+          # conversion for adjusted_billing_effective_date [type = org.joda.time.LocalDate]
+          @adjusted_billing_effective_date = j_obj.adjusted_billing_effective_date
+          if !@adjusted_billing_effective_date.nil?
+            @adjusted_billing_effective_date = @adjusted_billing_effective_date.to_s
+          end
+
+          # conversion for adjusted_billing_action_policy [type = org.killbill.billing.catalog.api.BillingActionPolicy]
+          @adjusted_billing_action_policy = j_obj.adjusted_billing_action_policy
+          @adjusted_billing_action_policy = @adjusted_billing_action_policy.to_s.to_sym unless @adjusted_billing_action_policy.nil?
+
           # conversion for adjusted_entitlement_specifiers [type = java.util.List]
           @adjusted_entitlement_specifiers = j_obj.adjusted_entitlement_specifiers
           tmp = []

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

@@ -28,6 +28,7 @@
 require 'killbill/gen/plugin-api/payment_method_info_plugin'
 require 'killbill/gen/plugin-api/payment_plugin_api'
 require 'killbill/gen/plugin-api/payment_plugin_api_exception'
+require 'killbill/gen/plugin-api/blocking_state_metadata'
 require 'killbill/gen/plugin-api/broadcast_metadata'
 require 'killbill/gen/plugin-api/ext_bus_event'
 require 'killbill/gen/plugin-api/notification_plugin_api'

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

@@ -162,6 +162,7 @@ module Killbill
                        .or(t[:kb_payment_transaction_id].eq(search_key))
                        .or(t[:message].eq(search_key))
                        .or(t[:authorization].eq(search_key))
+                       .or(t[:fraud_review].eq(search_key))
 
             # Only search successful payments and refunds
             where_clause = where_clause.and(t[:success].eq(true))

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

@@ -86,12 +86,7 @@ module Killbill
 
             # Go to the gateway - while some gateways implementations are smart and have void support 'auth_reversal' and 'void' (e.g. Litle),
             # others (e.g. CyberSource) implement different methods
-            if linked_transaction.transaction_type == 'AUTHORIZE' && gateway.respond_to?(:auth_reversal)
-              options[:currency] ||= linked_transaction.currency
-              gateway.auth_reversal(linked_transaction.amount_in_cents, authorization, options)
-            else
-              gateway.void(authorization, options)
-            end
+            linked_transaction.transaction_type == 'AUTHORIZE' && gateway.respond_to?(:auth_reversal) ? gateway.auth_reversal(linked_transaction.amount_in_cents, authorization, options) : gateway.void(authorization, options)
           end
 
           linked_transaction_proc = Proc.new do |amount_in_cents, options|

data/lib/killbill/migration.rb

@@ -3,19 +3,8 @@ require 'logger'
 require 'active_record'
 require 'arjdbc'
 
-begin
-  require 'jdbc/mariadb'
-  Jdbc::MariaDB.load_driver
-rescue LoadError
-# ignored
-end
-
-begin
-  require 'jdbc/postgres'
-  Jdbc::Postgres.load_driver
-rescue LoadError
-# ignored
-end
+require 'jdbc/mariadb'
+Jdbc::MariaDB.load_driver
 
 module Killbill
   class Migration