killbill 1.8.2 → 1.8.3

data/Jarfile

@@ -1,6 +1,6 @@
-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'
+jar 'com.ning.billing:killbill-api', '0.7.4'
+jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.6.1'
+jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.6.1'
+jar 'com.ning.billing.plugin:killbill-plugin-api-currency', '0.6.1'
 jar 'com.ning.billing:killbill-util:tests', '0.7.0'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/NEWS

@@ -1,3 +1,6 @@
+1.8.3
+    Regenerate models for currency conversion api changes
+
 1.8.2
     Add missing regenerated RefundInfoPlugin and PaymentInfoPlugin for new currency
 

data/VERSION

@@ -1 +1 @@
-1.8.2
+1.8.3

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

@@ -32,42 +32,40 @@ module Killbill
 
         include com.ning.billing.currency.api.CurrencyConversion
 
-        attr_accessor :conversion_date, :base_currency, :rates
+        attr_accessor :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?
+          # conversion for rates [type = java.util.Set]
+          tmp = java.util.TreeSet.new
+          (@rates || []).each do |m|
+            # conversion for m [type = com.ning.billing.currency.api.Rate]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @rates = tmp
           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]
+          # conversion for rates [type = java.util.Set]
           @rates = j_obj.rates
-          @rates = Killbill::Plugin::Model::Rates.new.to_ruby(@rates) unless @rates.nil?
+          tmp = []
+          (@rates || []).each do |m|
+            # conversion for m [type = com.ning.billing.currency.api.Rate]
+            m = Killbill::Plugin::Model::Rate.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @rates = tmp
           self
         end
 

data/lib/killbill/gen/{plugin-api → api}/rate.rb

@@ -27,10 +27,10 @@ module Killbill
   module Plugin
     module Model
 
-      java_package 'com.ning.billing.currency.plugin.api'
+      java_package 'com.ning.billing.currency.api'
       class Rate
 
-        include com.ning.billing.currency.plugin.api.Rate
+        include com.ning.billing.currency.api.Rate
 
         attr_accessor :base_currency, :currency, :value, :conversion_date
 

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

@@ -55,7 +55,7 @@ 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/rate'
 require 'killbill/gen/api/blockable'
 require 'killbill/gen/api/blocking_api_exception'
 require 'killbill/gen/api/blocking_state'

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

@@ -128,7 +128,7 @@ module Killbill
           # conversion for res [type = java.util.Set]
           tmp = java.util.TreeSet.new
           (res || []).each do |m|
-            # conversion for m [type = com.ning.billing.currency.plugin.api.Rate]
+            # conversion for m [type = com.ning.billing.currency.api.Rate]
             m = m.to_java unless m.nil?
             tmp.add(m)
           end
@@ -163,7 +163,7 @@ module Killbill
           # conversion for res [type = java.util.Set]
           tmp = java.util.TreeSet.new
           (res || []).each do |m|
-            # conversion for m [type = com.ning.billing.currency.plugin.api.Rate]
+            # conversion for m [type = com.ning.billing.currency.api.Rate]
             m = m.to_java unless m.nil?
             tmp.add(m)
           end

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

@@ -29,6 +29,5 @@ 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/rate'
 require 'killbill/gen/plugin-api/payment_info_plugin'
 require 'killbill/gen/plugin-api/refund_info_plugin'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -194,7 +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/rate.rb
 - lib/killbill/gen/api/record_id_api.rb
 - lib/killbill/gen/api/refund.rb
 - lib/killbill/gen/api/require_gen.rb
@@ -227,7 +227,6 @@ files:
 - lib/killbill/gen/plugin-api/payment_method_info_plugin.rb
 - lib/killbill/gen/plugin-api/payment_plugin_api.rb
 - lib/killbill/gen/plugin-api/payment_plugin_api_exception.rb
-- lib/killbill/gen/plugin-api/rate.rb
 - lib/killbill/gen/plugin-api/refund_info_plugin.rb
 - lib/killbill/gen/plugin-api/require_gen.rb
 - lib/killbill/http_servlet.rb

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

@@ -1,79 +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 '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