killbill 1.0.15 → 1.0.16

data/lib/killbill/jkillbill_api.rb

@@ -0,0 +1,137 @@
+require 'killbill/jconverter'
+
+
+module Killbill
+  module Plugin
+
+    class JKillbillApi
+
+      attr_writer :account_user_api,
+                  :analytics_sanity_api,
+                  :analytics_user_api,
+                  :catalog_user_api,
+                  :entitlement_migration_api,
+                  :entitlement_timeline_api,
+                  :entitlement_transfer_api,
+                  :entitlement_user_api,
+                  :invoice_migration_api,
+                  :invoice_payment_api,
+                  :invoice_user_api,
+                  :meter_user_api,
+                  :overdue_user_api,
+                  :payment_api,
+                  :tenant_user_api,
+                  :usage_user_api,
+                  :audit_user_api,
+                  :custom_field_user_api,
+                  :export_user_api,
+                  :tag_user_api
+
+
+      def initialize(plugin_name, services)
+        @plugin_name = plugin_name
+        @plugged_services = []
+        services.each do |service_name, service_instance|
+          begin
+            self.send("#{service_name}=", service_instance)
+            @plugged_services << service_instance
+          rescue NoMethodError
+            # Expected for non APIs (e.g. logger)
+            #warn "Ignoring unsupported service: #{service_name}"
+          end
+        end
+      end
+
+      def proxy_api(method_name, *args)
+        @plugged_services.each do |s|
+          if s.class.method_defined?(method_name)
+            puts "Found service #{s.to_s} : #{method_name}"
+            return do_call_handle_exception(s, method_name, *args)
+          end
+        end
+        raise APINotAvailableError.new("API #{method_name} is not available")
+      end
+
+      private
+
+      def do_call_handle_exception(delegate_service, method_name, *args)
+        begin
+          # STEPH TODO hack tenant_id
+          call_context = create_call_context(nil, nil, nil, nil)
+          #puts "INPUT ARGS = #{args}"
+          jargs = convert_args(method_name, args)
+          #puts "OUTPUT JARGS = #{jargs.collect { |e| e.class}.join(", ")}"
+          res = delegate_service.send(method_name, *jargs, call_context)
+          if res.java_kind_of? Java::com.ning.billing.account.api.Account
+            return JConverter.from_account(res)
+          elsif res.java_kind_of? Java::com.ning.billing.util.tag.TagDefinition
+            return JConverter.from_tag_definition(res)
+          elsif res.java_kind_of? Java::com.ning.billing.util.tag.Tag
+            return JConverter.from_tag(res)
+          else
+            return res
+          end
+
+        rescue Exception => e
+          wrap_and_throw_exception(method_name, e)
+        end
+      end
+
+      def wrap_and_throw_exception(api, e)
+
+        raise e
+
+        message = "#{api} failure: #{e}"
+        unless e.backtrace.nil?
+          message = "#{message}\n#{e.backtrace.join("\n")}"
+        end
+        raise ApiErrorException.new("#{api} failure : #{e.message}")
+      end
+
+      def convert_args(api, args)
+
+
+        args.collect! do |a|
+          if a.is_a? Killbill::Plugin::Model::Account
+            JConverter.to_account(a)
+          elsif a.is_a? Killbill::Plugin::Model::AccountData
+            JConverter.to_account_data(a)
+          elsif a.is_a? Killbill::Plugin::Model::UUID
+            JConverter.to_uuid(a)
+          elsif a.is_a? Killbill::Plugin::Model::ObjectType
+            JConverter.to_object_type(a)
+          else
+            a
+          end
+        end
+      end
+
+
+      def create_tenant_context(tenant_id)
+        Killbill::Plugin::Model::TenantContext.new(0)
+      end
+
+      def create_call_context(tenant_id, user_token, reason_code, comments)
+        user_token = user_token.nil? ? java.util.UUID.randomUUID() : to_uuid(user_token)
+        created_date = org.joda.time.DateTime.new(org.joda.time.DateTimeZone::UTC)
+        updated_date = created_date
+        Killbill::Plugin::Model::CallContext.new(tenant_id,
+                                               user_token,
+                                               @plugin_name,
+                                               Java::com.ning.billing.util.callcontext.CallOrigin::EXTERNAL,
+                                               Java::com.ning.billing.util.callcontext.UserType::SYSTEM,
+                                               reason_code,
+                                               comments,
+                                               created_date,
+                                               updated_date)
+      end
+
+      class ApiErrorException < Exception
+      end
+
+      class APINotAvailableError < NotImplementedError
+      end
+
+    end
+  end
+end

data/lib/killbill/jnotification.rb

@@ -4,7 +4,6 @@ require 'singleton'
 
 require 'killbill/creator'
 require 'killbill/plugin'
-require 'killbill/jresponse/jevent'
 
 include Java
 

data/lib/killbill/jpayment.rb

@@ -4,21 +4,10 @@ require 'singleton'
 
 require 'killbill/creator'
 require 'killbill/plugin'
-require 'killbill/jresponse/jpayment_response'
-require 'killbill/jresponse/jrefund_response'
-require 'killbill/jresponse/jpayment_method_response'
-require 'killbill/jresponse/jpayment_method_response_internal'
+require 'killbill/jconverter'
 
 include Java
 
-class String
-   def snake_case
-     return downcase if match(/\A[A-Z]+\z/)
-     gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
-     gsub(/([a-z])([A-Z])/, '\1_\2').
-     downcase
-   end
-end
 
 module Killbill
   module Plugin
@@ -26,7 +15,6 @@ module Killbill
     java_package 'com.ning.billing.payment.plugin.api'
     class JPayment < JPlugin
 
-#      java_implements com.ning.billing.payment.plugin.api.PaymentPluginApi
       include com.ning.billing.payment.plugin.api.PaymentPluginApi
 
       def initialize(real_class_name, services = {})
@@ -36,21 +24,21 @@ module Killbill
       java_signature 'com.ning.billing.payment.plugin.api.PaymentInfoPlugin processPayment(java.util.UUID, java.util.UUID, java.util.UUID, java.lang.BigDecimal, com.ning.billing.catalog.api.Currency, com.ning.billing.util.callcontext.CallContext)'
       def process_payment(*args)
         do_call_handle_exception(__method__, *args) do |res|
-          return JPaymentResponse.new(res)
+          return JConverter.to_payment_info_plugin(res)
         end
       end
 
       java_signature 'Java::com.ning.billing.payment.plugin.api.PaymentInfoPlugin getPaymentInfo(java.util.UUID, java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
       def get_payment_info(*args)
         do_call_handle_exception(__method__, *args) do |res|
-          return JPaymentResponse.new(res)
+          return JConverter.to_payment_info_plugin(res)
         end
       end
 
       java_signature 'Java::com.ning.billing.payment.plugin.api.RefundInfoPlugin processRefund(java.util.UUID, java.util.UUID, java.lang.BigDecimal, com.ning.billing.catalog.api.Currency, Java::com.ning.billing.util.callcontext.CallContext)'
       def process_refund(*args)
         do_call_handle_exception(__method__, *args) do |res|
-          return JRefundResponse.new(res)
+          return JConverter.to_refund_info_plugin(res)
         end
       end
 
@@ -59,7 +47,7 @@ module Killbill
         do_call_handle_exception(__method__, *args) do |res|
           array_res = java.util.ArrayList.new
           res.each do |el|
-            array_res.add(JRefundResponse.new(el))
+            array_res.add(JConverter.to_refund_info_plugin(el))
           end
           return array_res
         end
@@ -82,7 +70,7 @@ module Killbill
       java_signature 'Java::com.ning.billing.payment.api.PaymentMethodPlugin getPaymentMethodDetail(java.util.UUID, java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
       def get_payment_method_detail(*args)
         do_call_handle_exception(__method__, *args) do |res|
-          return JPaymentMethodResponse.new(res)
+          return JConverter.to_payment_method_response(res)
         end
       end
 
@@ -98,7 +86,7 @@ module Killbill
         do_call_handle_exception(__method__, *args) do |res|
           array_res = java.util.ArrayList.new
           res.each do |el|
-            array_res.add(JPaymentMethodResponseInternal.new(el))
+            array_res.add(JConverter.to_payment_method_info_plugin(el))
           end
           return array_res
         end

data/lib/killbill/jplugin.rb

@@ -15,15 +15,20 @@ module Killbill
   module Plugin
     class JPlugin
 
-      attr_reader :delegate_plugin
+
+      attr_reader :delegate_plugin,
+                  # Called by the Killbill lifecycle to register the servlet
+                  :rack_handler
 
       # Called by the Killbill lifecycle when initializing the plugin
       def start_plugin
         @delegate_plugin.start_plugin
+        configure_rack_handler
       end
 
       # Called by the Killbill lifecycle when stopping the plugin
       def stop_plugin
+        unconfigure_rack_handler
         @delegate_plugin.stop_plugin
       end
 
@@ -36,27 +41,29 @@ module Killbill
         @delegate_plugin = Creator.new(plugin_class_name).create(services)
       end
 
-      # Called by the Killbill lifecycle to register the servlet
-      def rack_handler
+      def logger
+        require 'logger'
+        @delegate_plugin.nil? ? ::Logger.new(STDOUT) : @delegate_plugin.logger
+      end
+
+      protected
+
+      def configure_rack_handler
         config_ru = Pathname.new("#{@delegate_plugin.root}/config.ru").expand_path
         if config_ru.file?
           logger.info "Found Rack configuration file at #{config_ru.to_s}"
-          instance = Killbill::Plugin::RackHandler.instance
-          instance.configure(logger, config_ru.to_s) unless instance.configured?
-          instance
+          @rack_handler = Killbill::Plugin::RackHandler.instance
+          @rack_handler.configure(logger, config_ru.to_s) unless @rack_handler.configured?
         else
           logger.info "No Rack configuration file found at #{config_ru.to_s}"
           nil
         end
       end
 
-      def logger
-        require 'logger'
-        @delegate_plugin.nil? ? ::Logger.new(STDOUT) : @delegate_plugin.logger
+      def unconfigure_rack_handler
+        @rack_handler.unconfigure unless @rack_handler.nil?
       end
 
-      protected
-
       def do_call_handle_exception(method_name, *args)
          begin
            rargs = convert_args(method_name, args)
@@ -85,7 +92,8 @@ module Killbill
            elsif a.java_kind_of? java.util.UUID
              JConverter.from_uuid(a)
            elsif a.java_kind_of? java.math.BigDecimal
-             JConverter.from_big_decimal(a)
+             # A bit fragile if what we recieve is not a price...
+             JConverter.from_big_decimal_with_cents_conversion(a)
            elsif a.java_kind_of? Java::com.ning.billing.catalog.api.Currency
              a.to_string
            elsif a.java_kind_of? Java::com.ning.billing.payment.api.PaymentMethodPlugin
@@ -110,15 +118,18 @@ module Killbill
                end
              end
              result
+           elsif a.java_kind_of? Java::com.ning.billing.util.callcontext.CallContext
+             JConverter.from_call_context(a)
+           elsif a.java_kind_of? Java::com.ning.billing.util.callcontext.TenantContext
+             JConverter.from_tenant_context(a)
            else
              # Since we don't pass the Context at this point, we can't raise any exceptions for unexpected types.
-             #raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("#{api} failure", "Unexpected parameter type #{a.class}")
-             nil
+             raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("#{api} failure", "Unexpected parameter type #{a.class}")
            end
         end
         # Remove last argument if this is null (it means we passed a context)
-        args.delete_at(-1) if args[-1].nil?
-        args
+        #args.delete_at(-1) if args[-1].nil?
+        #args
       end
 
     end

data/lib/killbill/killbill_api.rb

@@ -0,0 +1,28 @@
+
+
+module Killbill
+  module Plugin
+
+    #
+    # Represents a subset of the Killbill Apis offered to the ruby plugins
+    #
+    class KillbillApi
+
+
+      def initialize(japi_proxy)
+        @japi_proxy = japi_proxy
+        EXPORT_KILLBILL_API.each do |api|
+
+        end
+      end
+
+      def method_missing(m, *args, &block)
+        # m being a symbol, to_s is required for Ruby 1.8
+        puts "Got missing method #{m.to_s}"
+        return @japi_proxy.proxy_api(m.to_s, *args) if EXPORT_KILLBILL_API.include? m.to_s
+        raise NoMethodError.new("undefined method `#{m}' for #{self}")
+      end
+
+    end
+  end
+end

data/lib/killbill/killbill_logger.rb

@@ -1,4 +1,6 @@
 # Plugin logger that will delegate to the OSGI LogService
+# Used for regular logging for plugins, as well as Rack logger and Error Stream
+# Methods to implement for rack are described here: http://rack.rubyforge.org/doc/SPEC.html
 module Killbill
   module Plugin
     class KillbillLogger
@@ -6,20 +8,41 @@ module Killbill
         @logger = delegate
       end
 
-      def debug(msg)
-        @logger.log(4, msg)
+      def debug(message, &block)
+        @logger.log(4, build_message(message, &block))
       end
 
-      def info(msg)
-        @logger.log(3, msg)
+      def info(message, &block)
+        @logger.log(3, build_message(message, &block))
       end
 
-      def warn(msg)
-        @logger.log(2, msg)
+      def warn(message, &block)
+        @logger.log(2, build_message(message, &block))
       end
 
-      def error(msg)
-        @logger.log(1, msg)
+      def error(message, &block)
+        @logger.log(1, build_message(message, &block))
+      end
+
+      # Rack Error stream
+      alias_method :puts, :warn
+      alias_method :write, :warn
+
+      def flush
+      end
+
+      def close
+      end
+
+      def build_message(message, &block)
+        if message.nil?
+          if block_given?
+            message = yield
+          else
+            message = "(nil)"
+          end
+        end
+        message.nil? ? "(nil)" : message.to_s
       end
 
       alias_method :fatal, :error

data/lib/killbill/notification.rb

@@ -1,5 +1,4 @@
 require 'killbill/plugin'
-require 'killbill/response/event'
 
 module Killbill
   module Plugin

data/lib/killbill/payment.rb

@@ -1,9 +1,4 @@
 require 'killbill/plugin'
-require 'killbill/response/payment_status'
-require 'killbill/response/payment_response'
-require 'killbill/response/refund_response'
-require 'killbill/response/payment_method_response'
-require 'killbill/response/payment_method_response_internal'
 
 module Killbill
   module Plugin

data/lib/killbill/plugin.rb

@@ -20,44 +20,18 @@ module Killbill
         @active = false
       end
 
-      attr_writer :account_user_api,
-                  :analytics_sanity_api,
-                  :analytics_user_api,
-                  :catalog_user_api,
-                  :entitlement_migration_api,
-                  :entitlement_timeline_api,
-                  :entitlement_transfer_api,
-                  :entitlement_user_api,
-                  :invoice_migration_api,
-                  :invoice_payment_api,
-                  :invoice_user_api,
-                  :meter_user_api,
-                  :overdue_user_api,
-                  :payment_api,
-                  :tenant_user_api,
-                  :usage_user_api,
-                  :audit_user_api,
-                  :custom_field_user_api,
-                  :export_user_api,
-                  :tag_user_api
       # Extra services
       attr_accessor :root,
                     :logger,
-                    :conf_dir
+                    :conf_dir,
+                    :kb_apis
 
       # Called by the Killbill lifecycle when instantiating the plugin
-      def initialize(services = {})
+      def initialize()
         @active = false
-
-        services.each do |service_name, service_instance|
-          begin
-            self.send("#{service_name}=", service_instance)
-          rescue NoMethodError
-            warn "Ignoring unsupported service: #{service_name}"
-          end
-        end
       end
 
+
       def logger=(logger)
         # logger is an OSGI LogService in the Killbill environment. For testing purposes,
         # allow delegation to a standard logger
@@ -72,22 +46,6 @@ module Killbill
       def after_request
       end
 
-      class APINotAvailableError < NotImplementedError
-      end
-
-      def method_missing(m, *args, &block)
-        # m being a symbol, to_s is required for Ruby 1.8
-        if m.to_s =~ /_api$/
-          api = self.instance_variable_get("@#{m.to_s}")
-          if api.nil?
-            raise APINotAvailableError.new("API #{m} is not available")
-          else
-            api
-          end
-        else
-          raise NoMethodError.new("undefined method `#{m}' for #{self}")
-        end
-      end
     end
   end
 end