killbill 4.0.0 → 4.1.0

data/generators/active_merchant/templates/Jarfile.rb

@@ -1,9 +1,9 @@
-jar 'org.kill-bill.billing:killbill-api', '0.14'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.9'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.9'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.9'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.9'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.9'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.13.7'
+jar 'org.kill-bill.billing:killbill-api', '0.17'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.10'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.10'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.10'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.10'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.10'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.14.0'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/generators/active_merchant/templates/plugin.gemspec.rb

@@ -29,9 +29,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord', '~> 4.1.0'
   if defined?(JRUBY_VERSION)
     s.add_dependency 'activerecord-bogacs', '~> 0.3'
-    s.add_dependency 'activerecord-jdbc-adapter', '~> 1.3'
-    # Required to avoid errors like java.lang.NoClassDefFoundError: org/bouncycastle/asn1/DERBoolean
-    s.add_dependency 'jruby-openssl', '~> 0.9.6'
+    s.add_dependency 'activerecord-jdbc-adapter', '~> 1.3', '< 1.5'
+    s.add_dependency 'jruby-openssl', '~> 0.9.7'
   end
   s.add_dependency 'actionpack', '~> 4.1.0'
   s.add_dependency 'actionview', '~> 4.1.0'

data/killbill.gemspec

@@ -1,8 +1,11 @@
-version = File.read(File.expand_path('../VERSION', __FILE__)).strip
+# coding: utf-8
 
 Gem::Specification.new do |s|
   s.name        = 'killbill'
-  s.version     = version
+
+  path = File.expand_path('lib/killbill/version.rb', File.dirname(__FILE__))
+  s.version = File.read(path).match( /.*VERSION\s*=\s*['"](.*)['"]/m )[1]
+
   s.summary     = 'Framework to write Kill Bill plugins in Ruby.'
   s.description = 'Base classes to write plugins.'
 

data/lib/killbill.rb

@@ -1,22 +1,21 @@
-begin
-  require 'java'
+# Add method snake_case to String as early as possible so all classes below can use it
+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
 
-  # Add method snake_case to String as early as possible so all classes below can use it
-  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
+   def to_class
+     self.split('::').inject(Kernel) do |mod, class_name|
+       mod.const_get(class_name)
      end
+   end
+end
 
-     def to_class
-       self.split('::').inject(Kernel) do |mod, class_name|
-         mod.const_get(class_name)
-       end
-     end
-  end
-
+begin
+  require 'java'
 
   #
   # The Killbill Java APIs imported into that jruby bridge
@@ -59,9 +58,14 @@ end
 
 require 'tzinfo'
 require 'bigdecimal'
-require 'killbill/gen/api/require_gen'
-require 'killbill/gen/plugin-api/require_gen'
-require 'killbill/notification'
-require 'killbill/payment'
-require 'killbill/invoice'
-require 'killbill/currency'
+
+module Killbill
+  require 'killbill/gen/api/require_gen'
+  require 'killbill/gen/plugin-api/require_gen'
+  require 'killbill/notification'
+  require 'killbill/payment'
+  require 'killbill/payment_control'
+  require 'killbill/invoice'
+  require 'killbill/currency'
+end
+KillBill = Killbill

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

@@ -0,0 +1,76 @@
+#############################################################################################
+#                                                                                           #
+#                   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.payment.api'
+      class AdminPaymentApi
+
+        include org.killbill.billing.payment.api.AdminPaymentApi
+
+        def initialize(real_java_api)
+          @real_java_api = real_java_api
+        end
+
+
+        java_signature 'Java::void fixPaymentTransactionState(Java::org.killbill.billing.payment.api.Payment, Java::org.killbill.billing.payment.api.PaymentTransaction, Java::org.killbill.billing.payment.api.TransactionStatus, Java::java.lang.String, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def fix_payment_transaction_state(payment, paymentTransaction, transactionStatus, lastSuccessPaymentState, currentPaymentStateName, properties, context)
+
+          # conversion for payment [type = org.killbill.billing.payment.api.Payment]
+          payment = payment.to_java unless payment.nil?
+
+          # conversion for paymentTransaction [type = org.killbill.billing.payment.api.PaymentTransaction]
+          paymentTransaction = paymentTransaction.to_java unless paymentTransaction.nil?
+
+          # conversion for transactionStatus [type = org.killbill.billing.payment.api.TransactionStatus]
+          transactionStatus = Java::org.killbill.billing.payment.api.TransactionStatus.value_of( transactionStatus.to_s ) unless transactionStatus.nil?
+
+          # conversion for lastSuccessPaymentState [type = java.lang.String]
+          lastSuccessPaymentState = lastSuccessPaymentState.to_s unless lastSuccessPaymentState.nil?
+
+          # conversion for currentPaymentStateName [type = java.lang.String]
+          currentPaymentStateName = currentPaymentStateName.to_s unless currentPaymentStateName.nil?
+
+          # conversion for properties [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (properties || []).each do |m|
+            # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          properties = tmp
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          @real_java_api.fix_payment_transaction_state(payment, paymentTransaction, transactionStatus, lastSuccessPaymentState, currentPaymentStateName, properties, context)
+        end
+      end
+    end
+  end
+end

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

@@ -183,6 +183,52 @@ module Killbill
           end
         end
 
+        java_signature 'Java::org.killbill.billing.payment.api.Payment createCaptureWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def create_capture_with_payment_control(account, paymentId, amount, currency, paymentTransactionExternalKey, properties, paymentOptions, context)
+
+          # conversion for account [type = org.killbill.billing.account.api.Account]
+          account = account.to_java unless account.nil?
+
+          # conversion for paymentId [type = java.util.UUID]
+          paymentId = java.util.UUID.fromString(paymentId.to_s) unless paymentId.nil?
+
+          # conversion for amount [type = java.math.BigDecimal]
+          if amount.nil?
+            amount = java.math.BigDecimal::ZERO
+          else
+            amount = java.math.BigDecimal.new(amount.to_s)
+          end
+
+          # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
+          currency = Java::org.killbill.billing.catalog.api.Currency.value_of( currency.to_s ) unless currency.nil?
+
+          # conversion for paymentTransactionExternalKey [type = java.lang.String]
+          paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
+
+          # conversion for properties [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (properties || []).each do |m|
+            # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          properties = tmp
+
+          # conversion for paymentOptions [type = org.killbill.billing.payment.api.PaymentOptions]
+          paymentOptions = paymentOptions.to_java unless paymentOptions.nil?
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.create_capture_with_payment_control(account, paymentId, amount, currency, paymentTransactionExternalKey, properties, paymentOptions, context)
+            # conversion for res [type = org.killbill.billing.payment.api.Payment]
+            res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
+            return res
+          rescue Java::org.killbill.billing.payment.api.PaymentApiException => e
+            raise Killbill::Plugin::Model::PaymentApiException.new.to_ruby(e)
+          end
+        end
+
         java_signature 'Java::org.killbill.billing.payment.api.Payment createPurchase(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
         def create_purchase(account, paymentMethodId, paymentId, amount, currency, paymentExternalKey, paymentTransactionExternalKey, properties, context)
 
@@ -317,6 +363,42 @@ module Killbill
           end
         end
 
+        java_signature 'Java::org.killbill.billing.payment.api.Payment createVoidWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def create_void_with_payment_control(account, paymentId, paymentTransactionExternalKey, properties, paymentOptions, context)
+
+          # conversion for account [type = org.killbill.billing.account.api.Account]
+          account = account.to_java unless account.nil?
+
+          # conversion for paymentId [type = java.util.UUID]
+          paymentId = java.util.UUID.fromString(paymentId.to_s) unless paymentId.nil?
+
+          # conversion for paymentTransactionExternalKey [type = java.lang.String]
+          paymentTransactionExternalKey = paymentTransactionExternalKey.to_s unless paymentTransactionExternalKey.nil?
+
+          # conversion for properties [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (properties || []).each do |m|
+            # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          properties = tmp
+
+          # conversion for paymentOptions [type = org.killbill.billing.payment.api.PaymentOptions]
+          paymentOptions = paymentOptions.to_java unless paymentOptions.nil?
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.create_void_with_payment_control(account, paymentId, paymentTransactionExternalKey, properties, paymentOptions, context)
+            # conversion for res [type = org.killbill.billing.payment.api.Payment]
+            res = Killbill::Plugin::Model::Payment.new.to_ruby(res) unless res.nil?
+            return res
+          rescue Java::org.killbill.billing.payment.api.PaymentApiException => e
+            raise Killbill::Plugin::Model::PaymentApiException.new.to_ruby(e)
+          end
+        end
+
         java_signature 'Java::org.killbill.billing.payment.api.Payment createRefund(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
         def create_refund(account, paymentId, amount, currency, paymentTransactionExternalKey, properties, context)
 

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

@@ -78,6 +78,48 @@ module Killbill
           end
         end
 
+        java_signature 'Java::org.killbill.billing.payment.plugin.api.HostedPaymentPageFormDescriptor buildFormDescriptorWithPaymentControl(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.lang.Iterable, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def build_form_descriptor_with_payment_control(account, paymentMethodId, customFields, properties, paymentOptions, 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|
+            # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          customFields = tmp
+
+          # conversion for properties [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (properties || []).each do |m|
+            # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          properties = tmp
+
+          # conversion for paymentOptions [type = org.killbill.billing.payment.api.PaymentOptions]
+          paymentOptions = paymentOptions.to_java unless paymentOptions.nil?
+
+          # 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_with_payment_control(account, paymentMethodId, customFields, properties, paymentOptions, 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
+          rescue Java::org.killbill.billing.payment.api.PaymentApiException => e
+            raise Killbill::Plugin::Model::PaymentApiException.new.to_ruby(e)
+          end
+        end
+
         java_signature 'Java::org.killbill.billing.payment.plugin.api.GatewayNotification processNotification(Java::java.lang.String, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
         def process_notification(notification, pluginName, properties, context)
 
@@ -107,6 +149,39 @@ module Killbill
             raise Killbill::Plugin::Model::PaymentApiException.new.to_ruby(e)
           end
         end
+
+        java_signature 'Java::org.killbill.billing.payment.plugin.api.GatewayNotification processNotificationWithPaymentControl(Java::java.lang.String, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.payment.api.PaymentOptions, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def process_notification_with_payment_control(notification, pluginName, properties, paymentOptions, context)
+
+          # conversion for notification [type = java.lang.String]
+          notification = notification.to_s unless notification.nil?
+
+          # conversion for pluginName [type = java.lang.String]
+          pluginName = pluginName.to_s unless pluginName.nil?
+
+          # conversion for properties [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (properties || []).each do |m|
+            # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          properties = tmp
+
+          # conversion for paymentOptions [type = org.killbill.billing.payment.api.PaymentOptions]
+          paymentOptions = paymentOptions.to_java unless paymentOptions.nil?
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.process_notification_with_payment_control(notification, pluginName, properties, paymentOptions, context)
+            # conversion for res [type = org.killbill.billing.payment.plugin.api.GatewayNotification]
+            res = Killbill::Plugin::Model::GatewayNotification.new.to_ruby(res) unless res.nil?
+            return res
+          rescue Java::org.killbill.billing.payment.api.PaymentApiException => e
+            raise Killbill::Plugin::Model::PaymentApiException.new.to_ruby(e)
+          end
+        end
       end
     end
   end

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

@@ -93,6 +93,7 @@ require 'killbill/gen/api/killbill_api'
 require 'killbill/gen/api/plugin_config_service_api'
 require 'killbill/gen/api/osgi_killbill'
 require 'killbill/gen/api/osgi_plugin_properties'
+require 'killbill/gen/api/admin_payment_api'
 require 'killbill/gen/api/payment'
 require 'killbill/gen/api/payment_api'
 require 'killbill/gen/api/payment_api_exception'

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

@@ -0,0 +1,76 @@
+#############################################################################################
+#                                                                                           #
+#                   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)
+#
+
+
+require 'killbill/gen/plugin-api/notification_plugin_api'
+module Killbill
+  module Plugin
+    module Api
+
+      java_package 'org.killbill.billing.catalog.plugin.api'
+      class CatalogPluginApi < NotificationPluginApi
+
+        include org.killbill.billing.catalog.plugin.api.CatalogPluginApi
+
+        def initialize(real_class_name, services = {})
+          super(real_class_name, services)
+        end
+
+
+        java_signature 'Java::org.killbill.billing.catalog.plugin.api.VersionedPluginCatalog getVersionedPluginCatalog(Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.TenantContext)'
+        def get_versioned_plugin_catalog(properties, context)
+
+          # 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.TenantContext]
+          context = Killbill::Plugin::Model::TenantContext.new.to_ruby(context) unless context.nil?
+          begin
+            res = @delegate_plugin.get_versioned_plugin_catalog(properties, context)
+            # conversion for res [type = org.killbill.billing.catalog.plugin.api.VersionedPluginCatalog]
+            res = res.to_java unless res.nil?
+            return res
+          rescue Exception => e
+            message = "Failure in get_versioned_plugin_catalog: #{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_versioned_plugin_catalog failure", e.message)
+          ensure
+            @delegate_plugin.after_request
+          end
+        end
+      end
+    end
+  end
+end