killbill 1.0.19 → 1.1.1

data/lib/killbill/gen/tenant_user_api.rb

@@ -0,0 +1,127 @@
+###################################################################################
+#                                                                                 #
+#                   Copyright 2010-2013 Ning, Inc.                                #
+#                                                                                 #
+#      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:                         #
+#                                                                                 #
+#          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 'com.ning.billing.tenant.api'
+      class TenantUserApi
+
+        include com.ning.billing.tenant.api.TenantUserApi
+
+        def initialize(real_java_api)
+          @real_java_api = real_java_api
+        end
+
+
+        java_signature 'Java::com.ning.billing.tenant.api.Tenant createTenant(Java::com.ning.billing.tenant.api.TenantData, Java::com.ning.billing.util.callcontext.CallContext)'
+        def create_tenant(data, context)
+          # conversion for data [type = com.ning.billing.tenant.api.TenantData]
+          data = data.to_java unless data.nil?
+          # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.create_tenant(data, context)
+            # conversion for res [type = com.ning.billing.tenant.api.Tenant]
+            res = Killbill::Plugin::Model::Tenant.new.to_ruby(res) unless res.nil?
+            return res
+          rescue Java::com.ning.billing.tenant.api.TenantApiException => e
+            raise Killbill::Plugin::Model::TenantApiException.new.to_ruby(e)
+          end
+        end
+
+        java_signature 'Java::com.ning.billing.tenant.api.Tenant getTenantByApiKey(Java::java.lang.String)'
+        def get_tenant_by_api_key(key)
+          # conversion for key [type = java.lang.String]
+          key = key.to_s unless key.nil?
+          begin
+            res = @real_java_api.get_tenant_by_api_key(key)
+            # conversion for res [type = com.ning.billing.tenant.api.Tenant]
+            res = Killbill::Plugin::Model::Tenant.new.to_ruby(res) unless res.nil?
+            return res
+          rescue Java::com.ning.billing.tenant.api.TenantApiException => e
+            raise Killbill::Plugin::Model::TenantApiException.new.to_ruby(e)
+          end
+        end
+
+        java_signature 'Java::com.ning.billing.tenant.api.Tenant getTenantById(Java::java.util.UUID)'
+        def get_tenant_by_id(tenantId)
+          # conversion for tenantId [type = java.util.UUID]
+          tenantId = java.util.UUID.fromString(tenantId.to_s) unless tenantId.nil?
+          begin
+            res = @real_java_api.get_tenant_by_id(tenantId)
+            # conversion for res [type = com.ning.billing.tenant.api.Tenant]
+            res = Killbill::Plugin::Model::Tenant.new.to_ruby(res) unless res.nil?
+            return res
+          rescue Java::com.ning.billing.tenant.api.TenantApiException => e
+            raise Killbill::Plugin::Model::TenantApiException.new.to_ruby(e)
+          end
+        end
+
+        java_signature 'Java::java.util.List getTenantValueForKey(Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
+        def get_tenant_value_for_key(key, context)
+          # conversion for key [type = java.lang.String]
+          key = key.to_s unless key.nil?
+          # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.get_tenant_value_for_key(key, context)
+            # conversion for res [type = java.util.List]
+            tmp = []
+            (res || []).each do |m|
+              # conversion for m [type = java.lang.String]
+              tmp << m
+            end
+            res = tmp
+            return res
+          rescue Java::com.ning.billing.tenant.api.TenantApiException => e
+            raise Killbill::Plugin::Model::TenantApiException.new.to_ruby(e)
+          end
+        end
+
+        java_signature 'Java::void addTenantKeyValue(Java::java.lang.String, Java::java.lang.String, Java::com.ning.billing.util.callcontext.CallContext)'
+        def add_tenant_key_value(key, value, context)
+          # conversion for key [type = java.lang.String]
+          key = key.to_s unless key.nil?
+          # conversion for value [type = java.lang.String]
+          value = value.to_s unless value.nil?
+          # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          @real_java_api.add_tenant_key_value(key, value, context)
+        end
+
+        java_signature 'Java::void deleteTenantKey(Java::java.lang.String, Java::com.ning.billing.util.callcontext.CallContext)'
+        def delete_tenant_key(key, context)
+          # conversion for key [type = java.lang.String]
+          key = key.to_s unless key.nil?
+          # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          @real_java_api.delete_tenant_key(key, context)
+        end
+      end
+    end
+  end
+end

data/lib/killbill/gen/unit.rb

@@ -0,0 +1,55 @@
+###################################################################################
+#                                                                                 #
+#                   Copyright 2010-2013 Ning, Inc.                                #
+#                                                                                 #
+#      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:                         #
+#                                                                                 #
+#          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
+
+      java_package 'com.ning.billing.catalog.api'
+      class Unit
+
+        include com.ning.billing.catalog.api.Unit
+
+        attr_accessor :name
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for name [type = java.lang.String]
+          @name = @name.to_s unless @name.nil?
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for name [type = java.lang.String]
+          @name = j_obj.name
+          self
+        end
+
+      end
+    end
+  end
+end

data/lib/killbill/jnotification.rb

@@ -19,7 +19,7 @@ module Killbill
         super(real_class_name, services)
       end
 
-      java_signature 'void onEvent(Java::com.ning.billing.beatrix.bus.api.ExtBusEvent)'
+      java_signature 'void onEvent(Java::com.ning.billing.notification.plugin.api.ExtBusEvent)'
       def on_event(*args)
          do_call_handle_exception(__method__, *args) do |res|
             return nil

data/lib/killbill/jpayment.rb

@@ -4,7 +4,6 @@ require 'singleton'
 
 require 'killbill/creator'
 require 'killbill/plugin'
-require 'killbill/jconverter'
 
 include Java
 
@@ -24,21 +23,24 @@ 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 JConverter.to_payment_info_plugin(res)
+          res.to_java
+          return 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 JConverter.to_payment_info_plugin(res)
+          res.to_java
+          return 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 JConverter.to_refund_info_plugin(res)
+          res.to_java
+          return res
         end
       end
 
@@ -47,7 +49,7 @@ module Killbill
         do_call_handle_exception(__method__, *args) do |res|
           array_res = java.util.ArrayList.new
           res.each do |el|
-            array_res.add(JConverter.to_refund_info_plugin(el))
+            array_res.add(el.to_java)
           end
           return array_res
         end
@@ -70,7 +72,8 @@ 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 JConverter.to_payment_method_response(res)
+          res.to_java
+          return res
         end
       end
 
@@ -86,7 +89,7 @@ module Killbill
         do_call_handle_exception(__method__, *args) do |res|
           array_res = java.util.ArrayList.new
           res.each do |el|
-            array_res.add(JConverter.to_payment_method_info_plugin(el))
+            array_res.add(el.to_java)
           end
           return array_res
         end

data/lib/killbill/jplugin.rb

@@ -65,67 +65,69 @@ module Killbill
       end
 
       def do_call_handle_exception(method_name, *args)
-         begin
-           rargs = convert_args(method_name, args)
-           res = @delegate_plugin.send(method_name.to_s.snake_case.to_sym, *rargs)
-           yield(res)
-         rescue Exception => e
-           wrap_and_throw_exception(method_name, e)
-         ensure
-           @delegate_plugin.after_request
-         end
-       end
-
-       def wrap_and_throw_exception(api, e)
-         message = "#{api} failure: #{e}"
-         unless e.backtrace.nil?
-           message = "#{message}\n#{e.backtrace.join("\n")}"
-         end
-         logger.warn message
-         raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("#{api} failure", e.message)
-       end
-
-       def convert_args(api, args)
-         args.collect! do |a|
-           if a.nil?
-             nil
-           elsif a.java_kind_of? java.util.UUID
-             JConverter.from_uuid(a)
-           elsif a.java_kind_of? java.math.BigDecimal
-             # 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
-             JConverter.from_payment_method_plugin(a)
-           elsif a.java_kind_of? Java::com.ning.billing.beatrix.bus.api.ExtBusEvent
-             JConverter.from_ext_bus_event(a)
-           elsif ((a.java_kind_of? Java::boolean) || (a.java_kind_of? java.lang.Boolean))
-             JConverter.from_boolean(a)
-           # Require because it looks like if non boxed value are passed they already arrive as Ruby type
-           elsif ((a.java_kind_of? TrueClass) || (a.java_kind_of? FalseClass))
-             a
-           elsif a.java_kind_of? java.util.List
-             result = Array.new
-             if a.size > 0
-               first_element = a.get(0)
-               if first_element.java_kind_of? Java::com.ning.billing.payment.plugin.api.PaymentMethodInfoPlugin
-                 a.each do |el|
-                   result << JConverter.from_payment_method_info_plugin(el)
-                 end
-               else
-                 raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("#{api} failure", "Unexpected parameter type #{first_element.class} for list")
-               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}")
-           end
+        begin
+          rargs = convert_args(method_name, args)
+          res = @delegate_plugin.send(method_name.to_s.snake_case.to_sym, *rargs)
+          yield(res)
+        rescue Exception => e
+          wrap_and_throw_exception(method_name, e)
+        ensure
+          @delegate_plugin.after_request
+        end
+      end
+
+      def wrap_and_throw_exception(api, e)
+        message = "#{api} failure: #{e}"
+        unless e.backtrace.nil?
+          message = "#{message}\n#{e.backtrace.join("\n")}"
+        end
+        logger.warn message
+        raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("#{api} failure", e.message)
+      end
+
+      def convert_args(api, args)
+        args.collect! do |a|
+          if a.nil?
+            nil
+          elsif a.java_kind_of? java.util.UUID
+            a.nil? ? nil : a.to_s
+          elsif a.java_kind_of? java.math.BigDecimal
+            a.nil? ? 0 : a.to_s.to_i
+          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
+            Killbill::Plugin::Model::PaymentMethodPlugin.new.to_ruby(a)
+          elsif a.java_kind_of? Java::com.ning.billing.notification.plugin.api.ExtBusEvent
+            Killbill::Plugin::Model::ExtBusEvent.new.to_ruby(a)
+          elsif ((a.java_kind_of? Java::boolean) || (a.java_kind_of? java.lang.Boolean))
+          elsif ((a.java_kind_of? TrueClass) || (a.java_kind_of? FalseClass))
+            if a.nil?
+              false
+            else
+              b_value = (a.java_kind_of? java.lang.Boolean) ? a.boolean_value : a
+              b_value ? true : false
+            end
+          elsif a.java_kind_of? java.util.List
+            result = Array.new
+            if a.size > 0
+              first_element = a.get(0)
+              if first_element.java_kind_of? Java::com.ning.billing.payment.plugin.api.PaymentMethodInfoPlugin
+                a.each do |el|
+                  result << Killbill::Plugin::Model::PaymentMethodInfoPlugin.new.to_ruby(el)
+                end
+              else
+                raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("#{api} failure", "Unexpected parameter type #{first_element.class} for list")
+              end
+            end
+            result
+          elsif a.java_kind_of? Java::com.ning.billing.util.callcontext.CallContext
+            Killbill::Plugin::Model::CallContext.new.to_ruby(a)
+          elsif a.java_kind_of? Java::com.ning.billing.util.callcontext.TenantContext
+            Killbill::Plugin::Model::TenantContext.new.to_ruby(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}")
+          end
         end
         # Remove last argument if this is null (it means we passed a context)
         #args.delete_at(-1) if args[-1].nil?

data/lib/killbill/killbill_api.rb

@@ -1,4 +1,4 @@
-
+require 'date'
 
 module Killbill
   module Plugin
@@ -8,21 +8,54 @@ module Killbill
     #
     class KillbillApi
 
-
-      def initialize(japi_proxy)
-        @japi_proxy = japi_proxy
-        EXPORT_KILLBILL_API.each do |api|
-
+      def initialize(plugin_name, java_service_map)
+        @plugin_name = plugin_name
+        @services = {}
+        puts "STEPH :::::::::::::::::  #{java_service_map.inspect}"
+        java_service_map.each do |k,v|
+          @services[k.to_sym] = create_proxy_api(k, v)
         end
       end
 
+      #
+      # Returns the proxy to the java api
+      #
       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
+
+        puts "Looking for api #{m}"
+
+        return @services[m.to_sym] if @services.include? m.to_sym
         raise NoMethodError.new("undefined method `#{m}' for #{self}")
       end
 
+
+      def create_context(tenant_id=nil, user_token=nil, reason_code=nil, comments=nil)
+        context = Killbill::Plugin::Model::CallContext.new
+        context.tenant_id= tenant_id
+        context.user_token= user_token
+        context.user_name= @plugin_name
+        context.call_origin= :EXTERNAL
+        context.user_type= :SYSTEM
+        context.reason_code= reason_code
+        context.comments= comments
+        context.created_date= DateTime.new
+        context.updated_date= DateTime.new
+        context
+      end
+
+      private
+
+      def create_proxy_api(api_name, java_api)
+        if api_name == "overdue_user_api"
+          return nil
+        end
+
+        puts "create_proxy_api #{api_name} #{java_api.inspect}"
+
+        proxy_class_name = "Killbill::Plugin::Api::#{api_name.to_s.split('_').map{|e| e.capitalize}.join}"
+        proxy_class_name.to_class.new(java_api)
+      end
+
     end
   end
 end