RubyGems - killbill - Versions diffs - 3.1.0 → 3.1.1 - Mend

killbill 3.1.0 → 3.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

checksums.yaml +4 -4
data/Jarfile +5 -5
data/NEWS +3 -0
data/VERSION +1 -1
data/generators/active_merchant/templates/Jarfile.rb +5 -5
data/generators/active_merchant/templates/plugin.gemspec.rb +1 -1
data/lib/killbill/gen/api/account_audit_logs.rb +39 -1
data/lib/killbill/gen/api/direct_payment_api.rb +30 -12
data/lib/killbill/gen/api/payment_gateway_api.rb +108 -0
data/lib/killbill/gen/api/require_gen.rb +1 -0
data/lib/killbill/gen/plugin-api/gateway_notification.rb +122 -0
data/lib/killbill/gen/plugin-api/hosted_payment_page_form_descriptor.rb +27 -1
data/lib/killbill/gen/plugin-api/payment_plugin_api.rb +17 -11
data/lib/killbill/gen/plugin-api/require_gen.rb +2 -3
data/spec/killbill/gen_conversions_spec.rb +66 -0
metadata +6 -4
data/lib/killbill/gen/plugin-api/hosted_payment_page_descriptor_fields.rb +0 -145
data/lib/killbill/gen/plugin-api/hosted_payment_page_notification.rb +0 -129

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3e2b2173652205054ae00074eaa95b29b28a5a0
-  data.tar.gz: fe6277ad4bbeb755a90e5ce3883d761621f99b9f
+  metadata.gz: 1317a97f82ee47ef1edb43f6ae039412692e9796
+  data.tar.gz: 6d2dac9de214407b21145f82a6e11a6c5c039f9d
 SHA512:
-  metadata.gz: eb8653e32d042dc14cb4abfa7c824a9c1ca455691ecf38ca7e04a2555514679773124cdff1c571e4d7148f6103884a1eb1bfbfefc64c4b81cab9854f01aed03e
-  data.tar.gz: 2500df5527371c926a8963678e2fe187d61af4f89be8c4800e09133a6acd7440371c68813a752fbe6ed4373475a17aedcc30b5b73bdb046ba239c50ccaf77f50
+  metadata.gz: a9afc87e7362830ccd361ada67e17d7195c5b23145aa32044036d5c48b866da55a94994e7dceaaf2c3f5858c4ecf21c6fe4c5c5dcf7106cfd585b27b590ffc05
+  data.tar.gz: a6d19179afdf5241037b95984d3eff53d08bd68fba3783a2103036b4b23dacbc1dd5dc241f25138887bd519d0c586557f14bdbb045a8ae3200c8566b5f211479

data/Jarfile CHANGED Viewed

@@ -1,6 +1,6 @@
-jar 'org.kill-bill.billing:killbill-api', '0.9.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.7.0'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.7.0'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.7.0'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.11.1'
+jar 'org.kill-bill.billing:killbill-api', '0.9.5'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.7.2'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.7.2'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.7.2'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.11.2'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/NEWS CHANGED Viewed

@@ -1,3 +1,6 @@
+3.1.1
+    Regenerate files for killbill-api 0.9.5 and killbill-plugin-api 0.7.2
 3.1.0
     Regenerate files for killbill-api 0.9.2 and killbill-plugin-api 0.7.0
     Add ActiveMerchant plugin generator

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 3.1.0
1	+ 3.1.1

data/generators/active_merchant/templates/Jarfile.rb CHANGED Viewed

@@ -1,6 +1,6 @@
-jar 'org.kill-bill.billing:killbill-api', '0.8.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.6.4'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.6.4'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.6.4'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.9.1'
+jar 'org.kill-bill.billing:killbill-api', '0.9.5'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.7.2'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.7.2'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.7.2'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.11.2'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

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

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.rdoc_options << '--exclude' << '.'
-  s.add_dependency 'killbill', '~> 3.0.0'
+  s.add_dependency 'killbill', '~> 3.1.0'
   s.add_dependency 'activemerchant', '~> 1.42.9'
   s.add_dependency 'activerecord', '~> 4.1.0'
   s.add_dependency 'actionpack', '~> 4.1.0'

data/lib/killbill/gen/api/account_audit_logs.rb CHANGED Viewed

@@ -32,7 +32,7 @@ module Killbill
         include org.killbill.billing.util.audit.AccountAuditLogs
-        attr_accessor :audit_logs_for_account, :audit_logs_for_bundle, :audit_logs_for_subscription, :audit_logs_for_subscription_event, :audit_logs_for_blocking_state, :audit_logs_for_invoice, :audit_logs_for_invoice_item, :audit_logs_for_invoice_payment, :audit_logs_for_payment, :audit_logs_for_payment_method, :audit_logs_for_refund, :audit_logs_for_chargeback, :audit_logs_for_tag, :audit_logs_for_custom_field, :audit_logs
+        attr_accessor :audit_logs_for_account, :audit_logs_for_bundle, :audit_logs_for_subscription, :audit_logs_for_subscription_event, :audit_logs_for_blocking_state, :audit_logs_for_invoice, :audit_logs_for_invoice_item, :audit_logs_for_invoice_payment, :audit_logs_for_payment, :audit_logs_for_direct_payment, :audit_logs_for_direct_payment_transaction, :audit_logs_for_payment_method, :audit_logs_for_refund, :audit_logs_for_chargeback, :audit_logs_for_tag, :audit_logs_for_custom_field, :audit_logs
         def initialize()
         end
@@ -119,6 +119,24 @@ module Killbill
           end
           @audit_logs_for_payment = tmp
+          # conversion for audit_logs_for_direct_payment [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs_for_direct_payment || []).each do |m|
+            # conversion for m [type = org.killbill.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs_for_direct_payment = tmp
+          # conversion for audit_logs_for_direct_payment_transaction [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs_for_direct_payment_transaction || []).each do |m|
+            # conversion for m [type = org.killbill.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs_for_direct_payment_transaction = tmp
           # conversion for audit_logs_for_payment_method [type = java.util.List]
           tmp = java.util.ArrayList.new
           (@audit_logs_for_payment_method || []).each do |m|
@@ -260,6 +278,26 @@ module Killbill
           end
           @audit_logs_for_payment = tmp
+          # conversion for audit_logs_for_direct_payment [type = java.util.List]
+          @audit_logs_for_direct_payment = j_obj.audit_logs_for_direct_payment
+          tmp = []
+          (@audit_logs_for_direct_payment || []).each do |m|
+            # conversion for m [type = org.killbill.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs_for_direct_payment = tmp
+          # conversion for audit_logs_for_direct_payment_transaction [type = java.util.List]
+          @audit_logs_for_direct_payment_transaction = j_obj.audit_logs_for_direct_payment_transaction
+          tmp = []
+          (@audit_logs_for_direct_payment_transaction || []).each do |m|
+            # conversion for m [type = org.killbill.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs_for_direct_payment_transaction = tmp
           # conversion for audit_logs_for_payment_method [type = java.util.List]
           @audit_logs_for_payment_method = j_obj.audit_logs_for_payment_method
           tmp = []

data/lib/killbill/gen/api/direct_payment_api.rb CHANGED Viewed

@@ -37,12 +37,15 @@ module Killbill
         end
-        java_signature 'Java::org.killbill.billing.payment.api.DirectPayment createAuthorization(Java::org.killbill.billing.account.api.Account, Java::java.math.BigDecimal, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def create_authorization(account, amount, externalKey, properties, context)
+        java_signature 'Java::org.killbill.billing.payment.api.DirectPayment createAuthorization(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_authorization(account, directPaymentId, amount, currency, externalKey, properties, context)
           # conversion for account [type = org.killbill.billing.account.api.Account]
           account = account.to_java unless account.nil?
+          # conversion for directPaymentId [type = java.util.UUID]
+          directPaymentId = java.util.UUID.fromString(directPaymentId.to_s) unless directPaymentId.nil?
           # conversion for amount [type = java.math.BigDecimal]
           if amount.nil?
             amount = java.math.BigDecimal::ZERO
@@ -50,6 +53,9 @@ module Killbill
             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 externalKey [type = java.lang.String]
           externalKey = externalKey.to_s unless externalKey.nil?
@@ -65,7 +71,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.create_authorization(account, amount, externalKey, properties, context)
+            res = @real_java_api.create_authorization(account, directPaymentId, amount, currency, externalKey, properties, context)
             # conversion for res [type = org.killbill.billing.payment.api.DirectPayment]
             res = Killbill::Plugin::Model::DirectPayment.new.to_ruby(res) unless res.nil?
             return res
@@ -74,8 +80,8 @@ module Killbill
           end
         end
-        java_signature 'Java::org.killbill.billing.payment.api.DirectPayment createCapture(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.math.BigDecimal, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def create_capture(account, directPaymentId, amount, properties, context)
+        java_signature 'Java::org.killbill.billing.payment.api.DirectPayment createCapture(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.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def create_capture(account, directPaymentId, amount, currency, properties, context)
           # conversion for account [type = org.killbill.billing.account.api.Account]
           account = account.to_java unless account.nil?
@@ -90,6 +96,9 @@ module Killbill
             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 properties [type = java.lang.Iterable]
           tmp = java.util.ArrayList.new
           (properties || []).each do |m|
@@ -102,7 +111,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.create_capture(account, directPaymentId, amount, properties, context)
+            res = @real_java_api.create_capture(account, directPaymentId, amount, currency, properties, context)
             # conversion for res [type = org.killbill.billing.payment.api.DirectPayment]
             res = Killbill::Plugin::Model::DirectPayment.new.to_ruby(res) unless res.nil?
             return res
@@ -111,12 +120,15 @@ module Killbill
           end
         end
-        java_signature 'Java::org.killbill.billing.payment.api.DirectPayment createPurchase(Java::org.killbill.billing.account.api.Account, Java::java.math.BigDecimal, Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def create_purchase(account, amount, externalKey, properties, context)
+        java_signature 'Java::org.killbill.billing.payment.api.DirectPayment createPurchase(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_purchase(account, directPaymentId, amount, currency, externalKey, properties, context)
           # conversion for account [type = org.killbill.billing.account.api.Account]
           account = account.to_java unless account.nil?
+          # conversion for directPaymentId [type = java.util.UUID]
+          directPaymentId = java.util.UUID.fromString(directPaymentId.to_s) unless directPaymentId.nil?
           # conversion for amount [type = java.math.BigDecimal]
           if amount.nil?
             amount = java.math.BigDecimal::ZERO
@@ -124,6 +136,9 @@ module Killbill
             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 externalKey [type = java.lang.String]
           externalKey = externalKey.to_s unless externalKey.nil?
@@ -139,7 +154,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.create_purchase(account, amount, externalKey, properties, context)
+            res = @real_java_api.create_purchase(account, directPaymentId, amount, currency, externalKey, properties, context)
             # conversion for res [type = org.killbill.billing.payment.api.DirectPayment]
             res = Killbill::Plugin::Model::DirectPayment.new.to_ruby(res) unless res.nil?
             return res
@@ -178,8 +193,8 @@ module Killbill
           end
         end
-        java_signature 'Java::org.killbill.billing.payment.api.DirectPayment createCredit(Java::org.killbill.billing.account.api.Account, Java::java.util.UUID, Java::java.math.BigDecimal, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def create_credit(account, directPaymentId, amount, properties, context)
+        java_signature 'Java::org.killbill.billing.payment.api.DirectPayment createCredit(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.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def create_credit(account, directPaymentId, amount, currency, properties, context)
           # conversion for account [type = org.killbill.billing.account.api.Account]
           account = account.to_java unless account.nil?
@@ -194,6 +209,9 @@ module Killbill
             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 properties [type = java.lang.Iterable]
           tmp = java.util.ArrayList.new
           (properties || []).each do |m|
@@ -206,7 +224,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.create_credit(account, directPaymentId, amount, properties, context)
+            res = @real_java_api.create_credit(account, directPaymentId, amount, currency, properties, context)
             # conversion for res [type = org.killbill.billing.payment.api.DirectPayment]
             res = Killbill::Plugin::Model::DirectPayment.new.to_ruby(res) unless res.nil?
             return res

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

@@ -0,0 +1,108 @@
+###################################################################################
+#                                                                                 #
+#                   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 'org.killbill.billing.payment.api'
+      class PaymentGatewayApi
+        include org.killbill.billing.payment.api.PaymentGatewayApi
+        def initialize(real_java_api)
+          @real_java_api = real_java_api
+        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)
+          # conversion for account [type = org.killbill.billing.account.api.Account]
+          account = account.to_java unless account.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 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)
+            # 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)
+          # 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 context [type = org.killbill.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.process_notification(notification, pluginName, properties, 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
+end

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

@@ -94,6 +94,7 @@ require 'killbill/gen/api/payment'
 require 'killbill/gen/api/payment_api'
 require 'killbill/gen/api/payment_api_exception'
 require 'killbill/gen/api/payment_attempt'
+require 'killbill/gen/api/payment_gateway_api'
 require 'killbill/gen/api/payment_method'
 require 'killbill/gen/api/payment_method_plugin'
 require 'killbill/gen/api/plugin_property'

data/lib/killbill/gen/plugin-api/gateway_notification.rb ADDED Viewed

@@ -0,0 +1,122 @@
+###################################################################################
+#                                                                                 #
+#                   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 'org.killbill.billing.payment.plugin.api'
+      class GatewayNotification
+        include org.killbill.billing.payment.plugin.api.GatewayNotification
+        attr_accessor :kb_payment_id, :status, :entity, :headers, :properties
+        def initialize()
+        end
+        def to_java()
+          # conversion for kb_payment_id [type = java.util.UUID]
+          @kb_payment_id = java.util.UUID.fromString(@kb_payment_id.to_s) unless @kb_payment_id.nil?
+          # conversion for status [type = int]
+          @status = @status
+          # conversion for entity [type = java.lang.String]
+          @entity = @entity.to_s unless @entity.nil?
+          # conversion for headers [type = java.util.Map]
+          tmp = java.util.HashMap.new
+          (@headers || {}).each do |k,v|
+            # conversion for k [type = java.lang.String]
+            k = k.to_s unless k.nil?
+              # conversion for v [type = java.util.List]
+              tmp1 = java.util.ArrayList.new
+              (v || []).each do |m|
+                # conversion for m [type = java.lang.String]
+                m = m.to_s unless m.nil?
+                tmp1.add(m)
+              end
+              v = tmp1
+              tmp.put(k, v)
+            end
+          @headers = tmp
+          # conversion for properties [type = java.util.List]
+          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
+          self
+        end
+        def to_ruby(j_obj)
+          # conversion for kb_payment_id [type = java.util.UUID]
+          @kb_payment_id = j_obj.kb_payment_id
+          @kb_payment_id = @kb_payment_id.nil? ? nil : @kb_payment_id.to_s
+          # conversion for status [type = int]
+          @status = j_obj.status
+          # conversion for entity [type = java.lang.String]
+          @entity = j_obj.entity
+          # conversion for headers [type = java.util.Map]
+          @headers = j_obj.headers
+          tmp = {}
+          jtmp0 = @headers || java.util.HashMap.new
+          jtmp0.key_set.each do |k|
+            # conversion for k [type = java.lang.String]
+            v = jtmp0.get(k)
+              # conversion for v [type = java.util.List]
+              tmp1 = []
+              (v || []).each do |m|
+                # conversion for m [type = java.lang.String]
+                tmp1 << m
+              end
+              v = tmp1
+              tmp[k] = v
+            end
+          @headers = tmp
+          # conversion for properties [type = java.util.List]
+          @properties = j_obj.properties
+          tmp = []
+          (@properties || []).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
+          self
+        end
+      end
+    end
+  end
+end

data/lib/killbill/gen/plugin-api/hosted_payment_page_form_descriptor.rb CHANGED Viewed

@@ -32,12 +32,15 @@ module Killbill
         include org.killbill.billing.payment.plugin.api.HostedPaymentPageFormDescriptor
-        attr_accessor :form_method, :form_url, :form_fields
+        attr_accessor :kb_account_id, :form_method, :form_url, :form_fields, :properties
         def initialize()
         end
         def to_java()
+          # conversion for kb_account_id [type = java.util.UUID]
+          @kb_account_id = java.util.UUID.fromString(@kb_account_id.to_s) unless @kb_account_id.nil?
           # conversion for form_method [type = java.lang.String]
           @form_method = @form_method.to_s unless @form_method.nil?
@@ -52,10 +55,23 @@ module Killbill
             tmp.add(m)
           end
           @form_fields = tmp
+          # conversion for properties [type = java.util.List]
+          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
           self
         end
         def to_ruby(j_obj)
+          # conversion for kb_account_id [type = java.util.UUID]
+          @kb_account_id = j_obj.kb_account_id
+          @kb_account_id = @kb_account_id.nil? ? nil : @kb_account_id.to_s
           # conversion for form_method [type = java.lang.String]
           @form_method = j_obj.form_method
@@ -71,6 +87,16 @@ module Killbill
             tmp << m
           end
           @form_fields = tmp
+          # conversion for properties [type = java.util.List]
+          @properties = j_obj.properties
+          tmp = []
+          (@properties || []).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
           self
         end

data/lib/killbill/gen/plugin-api/payment_plugin_api.rb CHANGED Viewed

@@ -684,14 +684,20 @@ module Killbill
           end
         end
-        java_signature 'Java::org.killbill.billing.payment.plugin.api.HostedPaymentPageFormDescriptor buildFormDescriptor(Java::java.util.UUID, Java::org.killbill.billing.payment.plugin.api.HostedPaymentPageDescriptorFields, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.TenantContext)'
-        def build_form_descriptor(kbAccountId, descriptorFields, properties, context)
+        java_signature 'Java::org.killbill.billing.payment.plugin.api.HostedPaymentPageFormDescriptor buildFormDescriptor(Java::java.util.UUID, Java::java.lang.Iterable, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def build_form_descriptor(kbAccountId, customFields, properties, context)
           # conversion for kbAccountId [type = java.util.UUID]
           kbAccountId = kbAccountId.nil? ? nil : kbAccountId.to_s
-          # conversion for descriptorFields [type = org.killbill.billing.payment.plugin.api.HostedPaymentPageDescriptorFields]
-          descriptorFields = Killbill::Plugin::Model::HostedPaymentPageDescriptorFields.new.to_ruby(descriptorFields) unless descriptorFields.nil?
+          # conversion for customFields [type = java.lang.Iterable]
+          tmp = []
+          (customFields.nil? ? [] : customFields.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
+          customFields = tmp
           # conversion for properties [type = java.lang.Iterable]
           tmp = []
@@ -702,10 +708,10 @@ module Killbill
           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?
+          # 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.build_form_descriptor(kbAccountId, descriptorFields, properties, context)
+            res = @delegate_plugin.build_form_descriptor(kbAccountId, customFields, properties, context)
             # conversion for res [type = org.killbill.billing.payment.plugin.api.HostedPaymentPageFormDescriptor]
             res = res.to_java unless res.nil?
             return res
@@ -721,7 +727,7 @@ module Killbill
           end
         end
-        java_signature 'Java::org.killbill.billing.payment.plugin.api.HostedPaymentPageNotification processNotification(Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.TenantContext)'
+        java_signature 'Java::org.killbill.billing.payment.plugin.api.GatewayNotification processNotification(Java::java.lang.String, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
         def process_notification(notification, properties, context)
           # conversion for notification [type = java.lang.String]
@@ -735,11 +741,11 @@ module Killbill
           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?
+          # 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.process_notification(notification, properties, context)
-            # conversion for res [type = org.killbill.billing.payment.plugin.api.HostedPaymentPageNotification]
+            # conversion for res [type = org.killbill.billing.payment.plugin.api.GatewayNotification]
             res = res.to_java unless res.nil?
             return res
           rescue Exception => e

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

@@ -23,14 +23,13 @@
 #
-require 'killbill/gen/plugin-api/hosted_payment_page_descriptor_fields'
-require 'killbill/gen/plugin-api/hosted_payment_page_form_descriptor'
-require 'killbill/gen/plugin-api/hosted_payment_page_notification'
 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/ext_bus_event'
 require 'killbill/gen/plugin-api/notification_plugin_api'
 require 'killbill/gen/plugin-api/currency_plugin_api'
+require 'killbill/gen/plugin-api/gateway_notification'
+require 'killbill/gen/plugin-api/hosted_payment_page_form_descriptor'
 require 'killbill/gen/plugin-api/payment_info_plugin'
 require 'killbill/gen/plugin-api/refund_info_plugin'

data/spec/killbill/gen_conversions_spec.rb ADDED Viewed

@@ -0,0 +1,66 @@
+require 'spec_helper'
+class TestGatewayNotification
+  include org.killbill.billing.payment.plugin.api.GatewayNotification
+  def initialize(headers)
+    @headers = headers
+  end
+  java_signature 'java.util.UUID getKbPaymentId'
+  def kb_payment_id
+  end
+  java_signature 'int getStatus'
+  def status
+  end
+  java_signature 'java.lang.String getEntity'
+  def entity
+  end
+  java_signature 'java.util.Map<java.lang.String, java.util.List<java.lang.String>> getHeaders'
+  def headers
+    @headers
+  end
+  java_signature 'java.util.List<org.killbill.billing.payment.api.PluginProperty> getProperties'
+  def properties
+  end
+end
+describe Killbill::Plugin do
+  it 'should be able to handle generic Maps' do
+    # jmap is a Map<String, String>
+    jmap = java.util.HashMap.new
+    jlistA = java.util.LinkedList.new
+    jlistA.add('Microsoft-IIS/8.0')
+    jmap.put('Server', jlistA)
+    jlistB = java.util.LinkedList.new
+    jlistB.add('no-cache')
+    jlistB.add('no-store')
+    jmap.put('Cache-Control', jlistB)
+    jgw_notification = TestGatewayNotification.new(jmap)
+    check_notification(jgw_notification)
+    rgw_notification = Killbill::Plugin::Model::GatewayNotification.new
+    rgw_notification.to_ruby(jgw_notification)
+    check_notification(rgw_notification)
+    jgw_notification2 = rgw_notification.to_java
+    check_notification(jgw_notification2)
+  end
+  private
+  def check_notification(notification)
+    notification.headers.size.should == 2
+    notification.headers['Server'].size.should == 1
+    notification.headers['Server'][0].should == 'Microsoft-IIS/8.0'
+    notification.headers['Cache-Control'].size.should == 2
+    notification.headers['Cache-Control'][0].should == 'no-cache'
+    notification.headers['Cache-Control'][1].should == 'no-store'
+  end
+end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -261,6 +261,7 @@ files:
 - lib/killbill/gen/api/payment_api.rb
 - lib/killbill/gen/api/payment_api_exception.rb
 - lib/killbill/gen/api/payment_attempt.rb
+- lib/killbill/gen/api/payment_gateway_api.rb
 - lib/killbill/gen/api/payment_method.rb
 - lib/killbill/gen/api/payment_method_kv_info.rb
 - lib/killbill/gen/api/payment_method_plugin.rb
@@ -309,9 +310,8 @@ files:
 - lib/killbill/gen/plugin-api/currency_plugin_api.rb
 - lib/killbill/gen/plugin-api/customer.rb
 - lib/killbill/gen/plugin-api/ext_bus_event.rb
-- lib/killbill/gen/plugin-api/hosted_payment_page_descriptor_fields.rb
+- lib/killbill/gen/plugin-api/gateway_notification.rb
 - lib/killbill/gen/plugin-api/hosted_payment_page_form_descriptor.rb
-- lib/killbill/gen/plugin-api/hosted_payment_page_notification.rb
 - lib/killbill/gen/plugin-api/notification_plugin_api.rb
 - lib/killbill/gen/plugin-api/payment_info_plugin.rb
 - lib/killbill/gen/plugin-api/payment_method_info_plugin.rb
@@ -347,6 +347,7 @@ files:
 - script/generate
 - spec/killbill/base_plugin_spec.rb
 - spec/killbill/config_test.ru
+- spec/killbill/gen_conversions_spec.rb
 - spec/killbill/helpers/payment_method_spec.rb
 - spec/killbill/helpers/response_spec.rb
 - spec/killbill/helpers/test_schema.rb
@@ -392,6 +393,7 @@ summary: Framework to write Kill Bill plugins in Ruby.
 test_files:
 - spec/killbill/base_plugin_spec.rb
 - spec/killbill/config_test.ru
+- spec/killbill/gen_conversions_spec.rb
 - spec/killbill/helpers/payment_method_spec.rb
 - spec/killbill/helpers/response_spec.rb
 - spec/killbill/helpers/test_schema.rb

data/lib/killbill/gen/plugin-api/hosted_payment_page_descriptor_fields.rb DELETED Viewed

@@ -1,145 +0,0 @@
-###################################################################################
-#                                                                                 #
-#                   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 'org.killbill.billing.payment.plugin.api'
-      class HostedPaymentPageDescriptorFields
-        include org.killbill.billing.payment.plugin.api.HostedPaymentPageDescriptorFields
-        attr_accessor :amount, :order, :credential2, :credential3, :credential4, :transaction_type, :auth_code, :account_name, :notify_url, :return_url, :forward_url, :cancel_return_url, :redirect_param, :description, :tax, :shipping
-        def initialize()
-        end
-        def to_java()
-          # conversion for amount [type = java.lang.String]
-          @amount = @amount.to_s unless @amount.nil?
-          # conversion for order [type = java.lang.String]
-          @order = @order.to_s unless @order.nil?
-          # conversion for credential2 [type = java.lang.String]
-          @credential2 = @credential2.to_s unless @credential2.nil?
-          # conversion for credential3 [type = java.lang.String]
-          @credential3 = @credential3.to_s unless @credential3.nil?
-          # conversion for credential4 [type = java.lang.String]
-          @credential4 = @credential4.to_s unless @credential4.nil?
-          # conversion for transaction_type [type = java.lang.String]
-          @transaction_type = @transaction_type.to_s unless @transaction_type.nil?
-          # conversion for auth_code [type = java.lang.String]
-          @auth_code = @auth_code.to_s unless @auth_code.nil?
-          # conversion for account_name [type = java.lang.String]
-          @account_name = @account_name.to_s unless @account_name.nil?
-          # conversion for notify_url [type = java.lang.String]
-          @notify_url = @notify_url.to_s unless @notify_url.nil?
-          # conversion for return_url [type = java.lang.String]
-          @return_url = @return_url.to_s unless @return_url.nil?
-          # conversion for forward_url [type = java.lang.String]
-          @forward_url = @forward_url.to_s unless @forward_url.nil?
-          # conversion for cancel_return_url [type = java.lang.String]
-          @cancel_return_url = @cancel_return_url.to_s unless @cancel_return_url.nil?
-          # conversion for redirect_param [type = java.lang.String]
-          @redirect_param = @redirect_param.to_s unless @redirect_param.nil?
-          # conversion for description [type = java.lang.String]
-          @description = @description.to_s unless @description.nil?
-          # conversion for tax [type = java.lang.String]
-          @tax = @tax.to_s unless @tax.nil?
-          # conversion for shipping [type = java.lang.String]
-          @shipping = @shipping.to_s unless @shipping.nil?
-          self
-        end
-        def to_ruby(j_obj)
-          # conversion for amount [type = java.lang.String]
-          @amount = j_obj.amount
-          # conversion for order [type = java.lang.String]
-          @order = j_obj.order
-          # conversion for credential2 [type = java.lang.String]
-          @credential2 = j_obj.credential2
-          # conversion for credential3 [type = java.lang.String]
-          @credential3 = j_obj.credential3
-          # conversion for credential4 [type = java.lang.String]
-          @credential4 = j_obj.credential4
-          # conversion for transaction_type [type = java.lang.String]
-          @transaction_type = j_obj.transaction_type
-          # conversion for auth_code [type = java.lang.String]
-          @auth_code = j_obj.auth_code
-          # conversion for account_name [type = java.lang.String]
-          @account_name = j_obj.account_name
-          # conversion for notify_url [type = java.lang.String]
-          @notify_url = j_obj.notify_url
-          # conversion for return_url [type = java.lang.String]
-          @return_url = j_obj.return_url
-          # conversion for forward_url [type = java.lang.String]
-          @forward_url = j_obj.forward_url
-          # conversion for cancel_return_url [type = java.lang.String]
-          @cancel_return_url = j_obj.cancel_return_url
-          # conversion for redirect_param [type = java.lang.String]
-          @redirect_param = j_obj.redirect_param
-          # conversion for description [type = java.lang.String]
-          @description = j_obj.description
-          # conversion for tax [type = java.lang.String]
-          @tax = j_obj.tax
-          # conversion for shipping [type = java.lang.String]
-          @shipping = j_obj.shipping
-          self
-        end
-      end
-    end
-  end
-end

data/lib/killbill/gen/plugin-api/hosted_payment_page_notification.rb DELETED Viewed

@@ -1,129 +0,0 @@
-###################################################################################
-#                                                                                 #
-#                   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 'org.killbill.billing.payment.plugin.api'
-      class HostedPaymentPageNotification
-        include org.killbill.billing.payment.plugin.api.HostedPaymentPageNotification
-        attr_accessor :kb_payment_id, :is_complete, :item_id, :transaction_id, :received_at, :payer_email, :receiver_email, :security_key, :gross_amount, :status
-        def initialize()
-        end
-        def to_java()
-          # conversion for kb_payment_id [type = java.util.UUID]
-          @kb_payment_id = java.util.UUID.fromString(@kb_payment_id.to_s) unless @kb_payment_id.nil?
-          # conversion for is_complete [type = boolean]
-          @is_complete = @is_complete.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_complete)
-          # conversion for item_id [type = java.lang.String]
-          @item_id = @item_id.to_s unless @item_id.nil?
-          # conversion for transaction_id [type = java.lang.String]
-          @transaction_id = @transaction_id.to_s unless @transaction_id.nil?
-          # conversion for received_at [type = org.joda.time.DateTime]
-          if !@received_at.nil?
-            @received_at =  (@received_at.kind_of? Time) ? DateTime.parse(@received_at.to_s) : @received_at
-            @received_at = Java::org.joda.time.DateTime.new(@received_at.to_s, Java::org.joda.time.DateTimeZone::UTC)
-          end
-          # conversion for payer_email [type = java.lang.String]
-          @payer_email = @payer_email.to_s unless @payer_email.nil?
-          # conversion for receiver_email [type = java.lang.String]
-          @receiver_email = @receiver_email.to_s unless @receiver_email.nil?
-          # conversion for security_key [type = java.lang.String]
-          @security_key = @security_key.to_s unless @security_key.nil?
-          # conversion for gross_amount [type = java.math.BigDecimal]
-          if @gross_amount.nil?
-            @gross_amount = java.math.BigDecimal::ZERO
-          else
-            @gross_amount = java.math.BigDecimal.new(@gross_amount.to_s)
-          end
-          # conversion for status [type = java.lang.String]
-          @status = @status.to_s unless @status.nil?
-          self
-        end
-        def to_ruby(j_obj)
-          # conversion for kb_payment_id [type = java.util.UUID]
-          @kb_payment_id = j_obj.kb_payment_id
-          @kb_payment_id = @kb_payment_id.nil? ? nil : @kb_payment_id.to_s
-          # conversion for is_complete [type = boolean]
-          @is_complete = j_obj.is_complete
-          if @is_complete.nil?
-            @is_complete = false
-          else
-            tmp_bool = (@is_complete.java_kind_of? java.lang.Boolean) ? @is_complete.boolean_value : @is_complete
-            @is_complete = tmp_bool ? true : false
-          end
-          # conversion for item_id [type = java.lang.String]
-          @item_id = j_obj.item_id
-          # conversion for transaction_id [type = java.lang.String]
-          @transaction_id = j_obj.transaction_id
-          # conversion for received_at [type = org.joda.time.DateTime]
-          @received_at = j_obj.received_at
-          if !@received_at.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(@received_at)
-            @received_at = DateTime.iso8601(str)
-          end
-          # conversion for payer_email [type = java.lang.String]
-          @payer_email = j_obj.payer_email
-          # conversion for receiver_email [type = java.lang.String]
-          @receiver_email = j_obj.receiver_email
-          # conversion for security_key [type = java.lang.String]
-          @security_key = j_obj.security_key
-          # conversion for gross_amount [type = java.math.BigDecimal]
-          @gross_amount = j_obj.gross_amount
-          @gross_amount = @gross_amount.nil? ? 0 : BigDecimal.new(@gross_amount.to_s)
-          # conversion for status [type = java.lang.String]
-          @status = j_obj.status
-          self
-        end
-      end
-    end
-  end
-end