killbill 3.2.2 → 3.2.3

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

@@ -39,12 +39,15 @@ module Killbill
         end
 
 
-        java_signature 'Java::org.killbill.billing.payment.plugin.api.HostedPaymentPageFormDescriptor buildFormDescriptor(Java::org.killbill.billing.account.api.Account, Java::java.lang.Iterable, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def build_form_descriptor(account, customFields, properties, context)
+        java_signature 'Java::org.killbill.billing.payment.plugin.api.HostedPaymentPageFormDescriptor buildFormDescriptor(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.lang.Iterable, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def build_form_descriptor(account, paymentMethodId, customFields, properties, context)
 
           # conversion for account [type = org.killbill.billing.account.api.Account]
           account = account.to_java unless account.nil?
 
+          # conversion for paymentMethodId [type = java.util.UUID]
+          paymentMethodId = java.util.UUID.fromString(paymentMethodId.to_s) unless paymentMethodId.nil?
+
           # conversion for customFields [type = java.lang.Iterable]
           tmp = java.util.ArrayList.new
           (customFields || []).each do |m|
@@ -66,7 +69,7 @@ module Killbill
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.build_form_descriptor(account, customFields, properties, context)
+            res = @real_java_api.build_form_descriptor(account, paymentMethodId, customFields, properties, context)
             # conversion for res [type = org.killbill.billing.payment.plugin.api.HostedPaymentPageFormDescriptor]
             res = Killbill::Plugin::Model::HostedPaymentPageFormDescriptor.new.to_ruby(res) unless res.nil?
             return res

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.catalog.api.PlanPhase
 
-        attr_accessor :fixed, :recurring, :usages, :name, :plan, :duration, :phase_type
+        attr_accessor :fixed, :recurring, :usages, :name, :duration, :phase_type
 
         def initialize()
         end
@@ -58,9 +58,6 @@ module Killbill
           # conversion for name [type = java.lang.String]
           @name = @name.to_s unless @name.nil?
 
-          # conversion for plan [type = org.killbill.billing.catalog.api.Plan]
-          @plan = @plan.to_java unless @plan.nil?
-
           # conversion for duration [type = org.killbill.billing.catalog.api.Duration]
           @duration = @duration.to_java unless @duration.nil?
 
@@ -91,10 +88,6 @@ module Killbill
           # conversion for name [type = java.lang.String]
           @name = j_obj.name
 
-          # conversion for plan [type = org.killbill.billing.catalog.api.Plan]
-          #@plan = j_obj.plan
-          #@plan = Killbill::Plugin::Model::Plan.new.to_ruby(@plan) unless @plan.nil?
-
           # conversion for duration [type = org.killbill.billing.catalog.api.Duration]
           @duration = j_obj.duration
           @duration = Killbill::Plugin::Model::Duration.new.to_ruby(@duration) unless @duration.nil?

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

@@ -34,18 +34,20 @@ module Killbill
 
         include org.killbill.billing.catalog.api.PriceListSet
 
+        attr_accessor 
+
         def initialize()
         end
 
         def to_java()
-          self
-        end
-
-        def to_ruby(j_obj)
-          self
-        end
-
+        self
       end
+
+      def to_ruby(j_obj)
+      self
     end
+
   end
 end
+end
+end

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.entitlement.api.Subscription
 
-        attr_accessor :base_entitlement_id, :bundle_id, :account_id, :external_key, :state, :source_type, :effective_start_date, :effective_end_date, :last_active_product, :last_active_plan, :last_active_phase, :last_active_price_list, :last_active_product_category, :id, :created_date, :updated_date, :billing_start_date, :billing_end_date, :charged_through_date
+        attr_accessor :base_entitlement_id, :bundle_id, :account_id, :external_key, :state, :source_type, :effective_start_date, :effective_end_date, :last_active_product, :last_active_plan, :last_active_phase, :last_active_price_list, :last_active_product_category, :id, :created_date, :updated_date, :billing_start_date, :billing_end_date, :charged_through_date, :subscription_events
 
         def initialize()
         end
@@ -112,6 +112,15 @@ module Killbill
           if !@charged_through_date.nil?
             @charged_through_date = Java::org.joda.time.LocalDate.parse(@charged_through_date.to_s)
           end
+
+          # conversion for subscription_events [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@subscription_events || []).each do |m|
+            # conversion for m [type = org.killbill.billing.entitlement.api.SubscriptionEvent]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @subscription_events = tmp
           self
         end
 
@@ -208,6 +217,16 @@ module Killbill
           if !@charged_through_date.nil?
             @charged_through_date = @charged_through_date.to_s
           end
+
+          # conversion for subscription_events [type = java.util.List]
+          @subscription_events = j_obj.subscription_events
+          tmp = []
+          (@subscription_events || []).each do |m|
+            # conversion for m [type = org.killbill.billing.entitlement.api.SubscriptionEvent]
+            m = Killbill::Plugin::Model::SubscriptionEvent.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @subscription_events = tmp
           self
         end
 

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

@@ -87,8 +87,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::java.util.List getTenantValueForKey(Java::java.lang.String, Java::org.killbill.billing.util.callcontext.TenantContext)'
-        def get_tenant_value_for_key(key, context)
+        java_signature 'Java::java.util.List getTenantValuesForKey(Java::java.lang.String, Java::org.killbill.billing.util.callcontext.TenantContext)'
+        def get_tenant_values_for_key(key, context)
 
           # conversion for key [type = java.lang.String]
           key = key.to_s unless key.nil?
@@ -96,7 +96,7 @@ module Killbill
           # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.get_tenant_value_for_key(key, context)
+            res = @real_java_api.get_tenant_values_for_key(key, context)
             # conversion for res [type = java.util.List]
             tmp = []
             (res || []).each do |m|

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

@@ -0,0 +1,207 @@
+#############################################################################################
+#                                                                                           #
+#                   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 Api
+
+      java_package 'org.killbill.billing.currency.plugin.api'
+      class CurrencyPluginWithEventsApi < JPlugin
+
+        include org.killbill.billing.currency.plugin.api.CurrencyPluginWithEventsApi
+
+        def initialize(real_class_name, services = {})
+          super(real_class_name, services)
+        end
+
+
+        java_signature 'Java::void onEvent(Java::org.killbill.billing.notification.plugin.api.ExtBusEvent)'
+        def on_event(killbillEvent)
+
+          # conversion for killbillEvent [type = org.killbill.billing.notification.plugin.api.ExtBusEvent]
+          killbillEvent = Killbill::Plugin::Model::ExtBusEvent.new.to_ruby(killbillEvent) unless killbillEvent.nil?
+          begin
+            @delegate_plugin.on_event(killbillEvent)
+          rescue Exception => e
+            message = "Failure in on_event: #{e}"
+            unless e.backtrace.nil?
+              message = "#{message}\n#{e.backtrace.join("\n")}"
+            end
+            logger.warn message
+            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("on_event failure", e.message)
+          ensure
+            @delegate_plugin.after_request
+          end
+        end
+
+        java_signature 'Java::java.util.Set getBaseCurrencies()'
+        def get_base_currencies()
+        begin
+          res = @delegate_plugin.get_base_currencies()
+          # conversion for res [type = java.util.Set]
+          tmp = java.util.TreeSet.new
+          (res || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.Currency]
+            m = Java::org.killbill.billing.catalog.api.Currency.value_of("#{m.to_s}") unless m.nil?
+            tmp.add(m)
+          end
+          res = tmp
+          return res
+        rescue Exception => e
+          message = "Failure in get_base_currencies: #{e}"
+          unless e.backtrace.nil?
+            message = "#{message}\n#{e.backtrace.join("\n")}"
+          end
+          logger.warn message
+          raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_base_currencies failure", e.message)
+        ensure
+          @delegate_plugin.after_request
+        end
+      end
+
+      java_signature 'Java::org.joda.time.DateTime getLatestConversionDate(Java::org.killbill.billing.catalog.api.Currency)'
+      def get_latest_conversion_date(baseCurrency)
+
+        # conversion for baseCurrency [type = org.killbill.billing.catalog.api.Currency]
+        baseCurrency = baseCurrency.to_s.to_sym unless baseCurrency.nil?
+        begin
+          res = @delegate_plugin.get_latest_conversion_date(baseCurrency)
+          # conversion for res [type = org.joda.time.DateTime]
+          if !res.nil?
+            res =  (res.kind_of? Time) ? DateTime.parse(res.to_s) : res
+            res = Java::org.joda.time.DateTime.new(res.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          end
+          return res
+        rescue Exception => e
+          message = "Failure in get_latest_conversion_date: #{e}"
+          unless e.backtrace.nil?
+            message = "#{message}\n#{e.backtrace.join("\n")}"
+          end
+          logger.warn message
+          raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_latest_conversion_date failure", e.message)
+        ensure
+          @delegate_plugin.after_request
+        end
+      end
+
+      java_signature 'Java::java.util.SortedSet getConversionDates(Java::org.killbill.billing.catalog.api.Currency)'
+      def get_conversion_dates(baseCurrency)
+
+        # conversion for baseCurrency [type = org.killbill.billing.catalog.api.Currency]
+        baseCurrency = baseCurrency.to_s.to_sym unless baseCurrency.nil?
+        begin
+          res = @delegate_plugin.get_conversion_dates(baseCurrency)
+          # conversion for res [type = java.util.SortedSet]
+          tmp = java.util.TreeSet.new
+          (res || []).each do |m|
+            # conversion for m [type = org.joda.time.DateTime]
+            if !m.nil?
+              m =  (m.kind_of? Time) ? DateTime.parse(m.to_s) : m
+              m = Java::org.joda.time.DateTime.new(m.to_s, Java::org.joda.time.DateTimeZone::UTC)
+            end
+            tmp.add(m)
+          end
+          res = tmp
+          return res
+        rescue Exception => e
+          message = "Failure in get_conversion_dates: #{e}"
+          unless e.backtrace.nil?
+            message = "#{message}\n#{e.backtrace.join("\n")}"
+          end
+          logger.warn message
+          raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_conversion_dates failure", e.message)
+        ensure
+          @delegate_plugin.after_request
+        end
+      end
+
+      java_signature 'Java::java.util.Set getCurrentRates(Java::org.killbill.billing.catalog.api.Currency)'
+      def get_current_rates(baseCurrency)
+
+        # conversion for baseCurrency [type = org.killbill.billing.catalog.api.Currency]
+        baseCurrency = baseCurrency.to_s.to_sym unless baseCurrency.nil?
+        begin
+          res = @delegate_plugin.get_current_rates(baseCurrency)
+          # conversion for res [type = java.util.Set]
+          tmp = java.util.TreeSet.new
+          (res || []).each do |m|
+            # conversion for m [type = org.killbill.billing.currency.api.Rate]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          res = tmp
+          return res
+        rescue Exception => e
+          message = "Failure in get_current_rates: #{e}"
+          unless e.backtrace.nil?
+            message = "#{message}\n#{e.backtrace.join("\n")}"
+          end
+          logger.warn message
+          raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_current_rates failure", e.message)
+        ensure
+          @delegate_plugin.after_request
+        end
+      end
+
+      java_signature 'Java::java.util.Set getRates(Java::org.killbill.billing.catalog.api.Currency, Java::org.joda.time.DateTime)'
+      def get_rates(baseCurrency, conversionDate)
+
+        # conversion for baseCurrency [type = org.killbill.billing.catalog.api.Currency]
+        baseCurrency = baseCurrency.to_s.to_sym unless baseCurrency.nil?
+
+        # conversion for conversionDate [type = org.joda.time.DateTime]
+        if !conversionDate.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(conversionDate)
+          conversionDate = DateTime.iso8601(str)
+        end
+        begin
+          res = @delegate_plugin.get_rates(baseCurrency, conversionDate)
+          # conversion for res [type = java.util.Set]
+          tmp = java.util.TreeSet.new
+          (res || []).each do |m|
+            # conversion for m [type = org.killbill.billing.currency.api.Rate]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          res = tmp
+          return res
+        rescue Exception => e
+          message = "Failure in get_rates: #{e}"
+          unless e.backtrace.nil?
+            message = "#{message}\n#{e.backtrace.join("\n")}"
+          end
+          logger.warn message
+          raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_rates failure", e.message)
+        ensure
+          @delegate_plugin.after_request
+        end
+      end
+    end
+  end
+end
+end

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.notification.plugin.api.ExtBusEvent
 
-        attr_accessor :event_type, :object_type, :object_id, :account_id, :tenant_id
+        attr_accessor :event_type, :object_type, :object_id, :meta_data, :account_id, :tenant_id
 
         def initialize()
         end
@@ -49,6 +49,9 @@ module Killbill
           # conversion for object_id [type = java.util.UUID]
           @object_id = java.util.UUID.fromString(@object_id.to_s) unless @object_id.nil?
 
+          # conversion for meta_data [type = java.lang.String]
+          @meta_data = @meta_data.to_s unless @meta_data.nil?
+
           # conversion for account_id [type = java.util.UUID]
           @account_id = java.util.UUID.fromString(@account_id.to_s) unless @account_id.nil?
 
@@ -70,6 +73,9 @@ module Killbill
           @object_id = j_obj.object_id
           @object_id = @object_id.nil? ? nil : @object_id.to_s
 
+          # conversion for meta_data [type = java.lang.String]
+          @meta_data = j_obj.meta_data
+
           # conversion for account_id [type = java.util.UUID]
           @account_id = j_obj.account_id
           @account_id = @account_id.nil? ? nil : @account_id.to_s

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

@@ -0,0 +1,103 @@
+#############################################################################################
+#                                                                                           #
+#                   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 Api
+
+      java_package 'org.killbill.billing.invoice.plugin.api'
+      class InvoicePluginWithEventsApi < JPlugin
+
+        include org.killbill.billing.invoice.plugin.api.InvoicePluginWithEventsApi
+
+        def initialize(real_class_name, services = {})
+          super(real_class_name, services)
+        end
+
+
+        java_signature 'Java::void onEvent(Java::org.killbill.billing.notification.plugin.api.ExtBusEvent)'
+        def on_event(killbillEvent)
+
+          # conversion for killbillEvent [type = org.killbill.billing.notification.plugin.api.ExtBusEvent]
+          killbillEvent = Killbill::Plugin::Model::ExtBusEvent.new.to_ruby(killbillEvent) unless killbillEvent.nil?
+          begin
+            @delegate_plugin.on_event(killbillEvent)
+          rescue Exception => e
+            message = "Failure in on_event: #{e}"
+            unless e.backtrace.nil?
+              message = "#{message}\n#{e.backtrace.join("\n")}"
+            end
+            logger.warn message
+            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("on_event failure", e.message)
+          ensure
+            @delegate_plugin.after_request
+          end
+        end
+
+        java_signature 'Java::java.util.List getAdditionalInvoiceItems(Java::org.killbill.billing.invoice.api.Invoice, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def get_additional_invoice_items(invoice, properties, context)
+
+          # conversion for invoice [type = org.killbill.billing.invoice.api.Invoice]
+          invoice = Killbill::Plugin::Model::Invoice.new.to_ruby(invoice) unless invoice.nil?
+
+          # conversion for properties [type = java.lang.Iterable]
+          tmp = []
+          (properties.nil? ? [] : properties.iterator).each do |m|
+            # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
+            m = Killbill::Plugin::Model::PluginProperty.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          properties = tmp
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
+          context = Killbill::Plugin::Model::CallContext.new.to_ruby(context) unless context.nil?
+          begin
+            res = @delegate_plugin.get_additional_invoice_items(invoice, properties, context)
+            # conversion for res [type = java.util.List]
+            tmp = java.util.ArrayList.new
+            (res || []).each do |m|
+              # conversion for m [type = org.killbill.billing.invoice.api.InvoiceItem]
+              m = m.to_java unless m.nil?
+              tmp.add(m)
+            end
+            res = tmp
+            return res
+          rescue Exception => e
+            message = "Failure in get_additional_invoice_items: #{e}"
+            unless e.backtrace.nil?
+              message = "#{message}\n#{e.backtrace.join("\n")}"
+            end
+            logger.warn message
+            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_additional_invoice_items failure", e.message)
+          ensure
+            @delegate_plugin.after_request
+          end
+        end
+      end
+    end
+  end
+end