killbill 1.8.0 → 1.8.1

data/Jarfile

@@ -1,4 +1,4 @@
-jar 'com.ning.billing:killbill-api', '0.7.2'
+jar 'com.ning.billing:killbill-api', '0.7.3'
 jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.6.0'
 jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.6.0'
 jar 'com.ning.billing.plugin:killbill-plugin-api-currency', '0.6.0'

data/NEWS

@@ -1,3 +1,6 @@
+1.8.1
+    Add currency api from Killbill for ruby plugins
+
 1.8.0
     Currency plugin support
 

data/VERSION

@@ -1 +1 @@
-1.8.0
+1.8.1

data/gen_config/api.conf

@@ -36,7 +36,8 @@ com.ning.billing.util.callcontext,
 com.ning.billing.util.customfield,
 com.ning.billing.util.entity,
 com.ning.billing.util.tag,
-com.ning.billing.security
+com.ning.billing.security,
+com.ning.billing.currency.api
 -x
 ExportUserApi,
 PluginConfig,

data/lib/killbill.rb

@@ -32,6 +32,7 @@ begin
     com.ning.billing.payment.api.PaymentApi
     com.ning.billing.util.api.CustomFieldUserApi
     com.ning.billing.util.api.TagUserApi
+    com.ning.billing.currency.api.CurrencyConversionApi
     javax.servlet.http.HttpServlet
   )
 

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

@@ -0,0 +1,77 @@
+###################################################################################
+#                                                                                 #
+#                   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.currency.api'
+      class CurrencyConversion
+
+        include com.ning.billing.currency.api.CurrencyConversion
+
+        attr_accessor :conversion_date, :base_currency, :rates
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for conversion_date [type = org.joda.time.DateTime]
+          if !@conversion_date.nil?
+            @conversion_date =  (@conversion_date.kind_of? Time) ? DateTime.parse(@conversion_date.to_s) : @conversion_date
+            @conversion_date = Java::org.joda.time.DateTime.new(@conversion_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          end
+
+          # conversion for base_currency [type = com.ning.billing.catalog.api.Currency]
+          @base_currency = Java::com.ning.billing.catalog.api.Currency.value_of("#{@base_currency.to_s}") unless @base_currency.nil?
+
+          # conversion for rates [type = com.ning.billing.currency.api.Rates]
+          @rates = @rates.to_java unless @rates.nil?
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for conversion_date [type = org.joda.time.DateTime]
+          @conversion_date = j_obj.conversion_date
+          if !@conversion_date.nil?
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time
+            str = fmt.print(@conversion_date)
+            @conversion_date = DateTime.iso8601(str)
+          end
+
+          # conversion for base_currency [type = com.ning.billing.catalog.api.Currency]
+          @base_currency = j_obj.base_currency
+          @base_currency = @base_currency.to_s.to_sym unless @base_currency.nil?
+
+          # conversion for rates [type = com.ning.billing.currency.api.Rates]
+          @rates = j_obj.rates
+          @rates = Killbill::Plugin::Model::Rates.new.to_ruby(@rates) unless @rates.nil?
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,96 @@
+###################################################################################
+#                                                                                 #
+#                   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.currency.api'
+      class CurrencyConversionApi
+
+        include com.ning.billing.currency.api.CurrencyConversionApi
+
+        def initialize(real_java_api)
+          @real_java_api = real_java_api
+        end
+
+
+        java_signature 'Java::java.util.Set getBaseRates()'
+        def get_base_rates()
+        begin
+          res = @real_java_api.get_base_rates()
+          # conversion for res [type = java.util.Set]
+          tmp = []
+          (res || []).each do |m|
+            # conversion for m [type = com.ning.billing.catalog.api.Currency]
+            m = m.to_s.to_sym unless m.nil?
+            tmp << m
+          end
+          res = tmp
+          return res
+        rescue Java::com.ning.billing.currency.api.CurrencyConversionException => e
+          raise Killbill::Plugin::Model::CurrencyConversionException.new.to_ruby(e)
+        end
+      end
+
+      java_signature 'Java::com.ning.billing.currency.api.CurrencyConversion getCurrentCurrencyConversion(Java::com.ning.billing.catalog.api.Currency)'
+      def get_current_currency_conversion(baseCurrency)
+
+        # conversion for baseCurrency [type = com.ning.billing.catalog.api.Currency]
+        baseCurrency = Java::com.ning.billing.catalog.api.Currency.value_of("#{baseCurrency.to_s}") unless baseCurrency.nil?
+        begin
+          res = @real_java_api.get_current_currency_conversion(baseCurrency)
+          # conversion for res [type = com.ning.billing.currency.api.CurrencyConversion]
+          res = Killbill::Plugin::Model::CurrencyConversion.new.to_ruby(res) unless res.nil?
+          return res
+        rescue Java::com.ning.billing.currency.api.CurrencyConversionException => e
+          raise Killbill::Plugin::Model::CurrencyConversionException.new.to_ruby(e)
+        end
+      end
+
+      java_signature 'Java::com.ning.billing.currency.api.CurrencyConversion getCurrencyConversion(Java::com.ning.billing.catalog.api.Currency, Java::org.joda.time.DateTime)'
+      def get_currency_conversion(baseCurrency, dateConversion)
+
+        # conversion for baseCurrency [type = com.ning.billing.catalog.api.Currency]
+        baseCurrency = Java::com.ning.billing.catalog.api.Currency.value_of("#{baseCurrency.to_s}") unless baseCurrency.nil?
+
+        # conversion for dateConversion [type = org.joda.time.DateTime]
+        if !dateConversion.nil?
+          dateConversion =  (dateConversion.kind_of? Time) ? DateTime.parse(dateConversion.to_s) : dateConversion
+          dateConversion = Java::org.joda.time.DateTime.new(dateConversion.to_s, Java::org.joda.time.DateTimeZone::UTC)
+        end
+        begin
+          res = @real_java_api.get_currency_conversion(baseCurrency, dateConversion)
+          # conversion for res [type = com.ning.billing.currency.api.CurrencyConversion]
+          res = Killbill::Plugin::Model::CurrencyConversion.new.to_ruby(res) unless res.nil?
+          return res
+        rescue Java::com.ning.billing.currency.api.CurrencyConversionException => e
+          raise Killbill::Plugin::Model::CurrencyConversionException.new.to_ruby(e)
+        end
+      end
+    end
+  end
+end
+end

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

@@ -0,0 +1,66 @@
+###################################################################################
+#                                                                                 #
+#                   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
+
+      class CurrencyConversionException
+
+
+        attr_accessor :message, :cause, :code
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for message [type = java.lang.String]
+          @message = @message.to_s unless @message.nil?
+
+          # conversion for cause [type = java.lang.Throwable]
+          @cause = @cause.to_s unless cause.nil?
+
+          # conversion for code [type = int]
+          @code = @code
+          Java::com.ning.billing.currency.api.CurrencyConversionException.new(@message, @cause, @code)
+        end
+
+        def to_ruby(j_obj)
+          # conversion for message [type = java.lang.String]
+          @message = j_obj.message
+
+          # conversion for cause [type = java.lang.Throwable]
+          @cause = j_obj.cause
+          @cause = @cause.to_s unless @cause.nil?
+
+          # conversion for code [type = int]
+          @code = j_obj.code
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -32,7 +32,7 @@ module Killbill
 
         include com.ning.billing.osgi.api.OSGIKillbill
 
-        attr_accessor :account_user_api, :catalog_user_api, :subscription_api, :invoice_payment_api, :invoice_user_api, :payment_api, :tenant_user_api, :usage_user_api, :audit_user_api, :custom_field_user_api, :export_user_api, :tag_user_api, :entitlement_api, :record_id_api, :plugin_config_service_api
+        attr_accessor :account_user_api, :catalog_user_api, :subscription_api, :invoice_payment_api, :invoice_user_api, :payment_api, :tenant_user_api, :usage_user_api, :audit_user_api, :custom_field_user_api, :export_user_api, :tag_user_api, :entitlement_api, :record_id_api, :currency_conversion_api, :plugin_config_service_api
 
         def initialize()
         end
@@ -80,6 +80,9 @@ module Killbill
           # conversion for record_id_api [type = com.ning.billing.util.api.RecordIdApi]
           @record_id_api = @record_id_api.to_java unless @record_id_api.nil?
 
+          # conversion for currency_conversion_api [type = com.ning.billing.currency.api.CurrencyConversionApi]
+          @currency_conversion_api = @currency_conversion_api.to_java unless @currency_conversion_api.nil?
+
           # conversion for plugin_config_service_api [type = com.ning.billing.osgi.api.config.PluginConfigServiceApi]
           @plugin_config_service_api = @plugin_config_service_api.to_java unless @plugin_config_service_api.nil?
           self
@@ -142,6 +145,10 @@ module Killbill
           @record_id_api = j_obj.record_id_api
           @record_id_api = Killbill::Plugin::Model::RecordIdApi.new.to_ruby(@record_id_api) unless @record_id_api.nil?
 
+          # conversion for currency_conversion_api [type = com.ning.billing.currency.api.CurrencyConversionApi]
+          @currency_conversion_api = j_obj.currency_conversion_api
+          @currency_conversion_api = Killbill::Plugin::Model::CurrencyConversionApi.new.to_ruby(@currency_conversion_api) unless @currency_conversion_api.nil?
+
           # conversion for plugin_config_service_api [type = com.ning.billing.osgi.api.config.PluginConfigServiceApi]
           @plugin_config_service_api = j_obj.plugin_config_service_api
           @plugin_config_service_api = Killbill::Plugin::Model::PluginConfigServiceApi.new.to_ruby(@plugin_config_service_api) unless @plugin_config_service_api.nil?

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

@@ -201,7 +201,7 @@ module Killbill
           paymentId = java.util.UUID.fromString(paymentId.to_s) unless paymentId.nil?
 
           # conversion for invoiceItemIds [type = java.util.Set]
-          tmp = java.util.ArrayList.new
+          tmp = java.util.TreeSet.new
           (invoiceItemIds || []).each do |m|
             # conversion for m [type = java.util.UUID]
             m = java.util.UUID.fromString(m.to_s) unless m.nil?

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

@@ -0,0 +1,79 @@
+###################################################################################
+#                                                                                 #
+#                   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.currency.api'
+      class Rates
+
+        include com.ning.billing.currency.api.Rates
+
+        attr_accessor :currencies, :rate
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for currencies [type = java.util.Set]
+          tmp = java.util.TreeSet.new
+          (@currencies || []).each do |m|
+            # conversion for m [type = com.ning.billing.catalog.api.Currency]
+            m = Java::com.ning.billing.catalog.api.Currency.value_of("#{m.to_s}") unless m.nil?
+            tmp.add(m)
+          end
+          @currencies = tmp
+
+          # conversion for rate [type = java.math.BigDecimal]
+          if @rate.nil?
+            @rate = java.math.BigDecimal::ZERO
+          else
+            @rate = java.math.BigDecimal.new(@rate.to_s)
+          end
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for currencies [type = java.util.Set]
+          @currencies = j_obj.currencies
+          tmp = []
+          (@currencies || []).each do |m|
+            # conversion for m [type = com.ning.billing.catalog.api.Currency]
+            m = m.to_s.to_sym unless m.nil?
+            tmp << m
+          end
+          @currencies = tmp
+
+          # conversion for rate [type = java.math.BigDecimal]
+          @rate = j_obj.rate
+          @rate = @rate.nil? ? 0 : BigDecimal.new(@rate.to_s)
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -52,6 +52,10 @@ require 'killbill/gen/api/price_list_set'
 require 'killbill/gen/api/product'
 require 'killbill/gen/api/static_catalog'
 require 'killbill/gen/api/unit'
+require 'killbill/gen/api/currency_conversion'
+require 'killbill/gen/api/currency_conversion_api'
+require 'killbill/gen/api/currency_conversion_exception'
+require 'killbill/gen/api/rates'
 require 'killbill/gen/api/blockable'
 require 'killbill/gen/api/blocking_api_exception'
 require 'killbill/gen/api/blocking_state'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -143,6 +143,9 @@ files:
 - lib/killbill/gen/api/catalog_user_api.rb
 - lib/killbill/gen/api/column_info.rb
 - lib/killbill/gen/api/control_tag.rb
+- lib/killbill/gen/api/currency_conversion.rb
+- lib/killbill/gen/api/currency_conversion_api.rb
+- lib/killbill/gen/api/currency_conversion_exception.rb
 - lib/killbill/gen/api/currency_value_null.rb
 - lib/killbill/gen/api/custom_field.rb
 - lib/killbill/gen/api/custom_field_api_exception.rb
@@ -191,6 +194,7 @@ files:
 - lib/killbill/gen/api/price_list.rb
 - lib/killbill/gen/api/price_list_set.rb
 - lib/killbill/gen/api/product.rb
+- lib/killbill/gen/api/rates.rb
 - lib/killbill/gen/api/record_id_api.rb
 - lib/killbill/gen/api/refund.rb
 - lib/killbill/gen/api/require_gen.rb