killbill 3.1.11 → 3.1.12

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.payment.api.PaymentOptions
 
-        attr_accessor :is_external_payment, :payment_control_plugin_name
+        attr_accessor :is_external_payment, :payment_control_plugin_names
 
         def initialize()
         end
@@ -43,8 +43,14 @@ module Killbill
           # conversion for is_external_payment [type = boolean]
           @is_external_payment = @is_external_payment.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_external_payment)
 
-          # conversion for payment_control_plugin_name [type = java.lang.String]
-          @payment_control_plugin_name = @payment_control_plugin_name.to_s unless @payment_control_plugin_name.nil?
+          # conversion for payment_control_plugin_names [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@payment_control_plugin_names || []).each do |m|
+            # conversion for m [type = java.lang.String]
+            m = m.to_s unless m.nil?
+            tmp.add(m)
+          end
+          @payment_control_plugin_names = tmp
           self
         end
 
@@ -58,8 +64,14 @@ module Killbill
             @is_external_payment = tmp_bool ? true : false
           end
 
-          # conversion for payment_control_plugin_name [type = java.lang.String]
-          @payment_control_plugin_name = j_obj.payment_control_plugin_name
+          # conversion for payment_control_plugin_names [type = java.util.List]
+          @payment_control_plugin_names = j_obj.payment_control_plugin_names
+          tmp = []
+          (@payment_control_plugin_names || []).each do |m|
+            # conversion for m [type = java.lang.String]
+            tmp << m
+          end
+          @payment_control_plugin_names = tmp
           self
         end
 

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

@@ -77,6 +77,7 @@ require 'killbill/gen/api/subscription_api_exception'
 require 'killbill/gen/api/subscription_bundle'
 require 'killbill/gen/api/subscription_bundle_timeline'
 require 'killbill/gen/api/subscription_event'
+require 'killbill/gen/api/dry_run_arguments'
 require 'killbill/gen/api/invoice_formatter'
 require 'killbill/gen/api/invoice_item_formatter'
 require 'killbill/gen/api/invoice'
@@ -106,7 +107,11 @@ require 'killbill/gen/api/tenant_api_exception'
 require 'killbill/gen/api/tenant_data'
 require 'killbill/gen/api/tenant_kv'
 require 'killbill/gen/api/tenant_user_api'
+require 'killbill/gen/api/rolled_up_unit'
 require 'killbill/gen/api/rolled_up_usage'
+require 'killbill/gen/api/subscription_usage_record'
+require 'killbill/gen/api/unit_usage_record'
+require 'killbill/gen/api/usage_record'
 require 'killbill/gen/api/usage_user_api'
 require 'killbill/gen/api/audit_user_api'
 require 'killbill/gen/api/column_info'

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

@@ -0,0 +1,63 @@
+#############################################################################################
+#                                                                                           #
+#                   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 Model
+
+      java_package 'org.killbill.billing.usage.api'
+      class RolledUpUnit
+
+        include org.killbill.billing.usage.api.RolledUpUnit
+
+        attr_accessor :unit_type, :amount
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for unit_type [type = java.lang.String]
+          @unit_type = @unit_type.to_s unless @unit_type.nil?
+
+          # conversion for amount [type = java.lang.Long]
+          @amount = @amount
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for unit_type [type = java.lang.String]
+          @unit_type = j_obj.unit_type
+
+          # conversion for amount [type = java.lang.Long]
+          @amount = j_obj.amount
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.usage.api.RolledUpUsage
 
-        attr_accessor :subscription_id, :unit_type, :start_time, :end_time, :amount
+        attr_accessor :subscription_id, :start, :end, :rolled_up_units
 
         def initialize()
         end
@@ -43,27 +43,24 @@ module Killbill
           # conversion for subscription_id [type = java.util.UUID]
           @subscription_id = java.util.UUID.fromString(@subscription_id.to_s) unless @subscription_id.nil?
 
-          # conversion for unit_type [type = java.lang.String]
-          @unit_type = @unit_type.to_s unless @unit_type.nil?
-
-          # conversion for start_time [type = org.joda.time.DateTime]
-          if !@start_time.nil?
-            @start_time =  (@start_time.kind_of? Time) ? DateTime.parse(@start_time.to_s) : @start_time
-            @start_time = Java::org.joda.time.DateTime.new(@start_time.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          # conversion for start [type = org.joda.time.LocalDate]
+          if !@start.nil?
+            @start = Java::org.joda.time.LocalDate.parse(@start.to_s)
           end
 
-          # conversion for end_time [type = org.joda.time.DateTime]
-          if !@end_time.nil?
-            @end_time =  (@end_time.kind_of? Time) ? DateTime.parse(@end_time.to_s) : @end_time
-            @end_time = Java::org.joda.time.DateTime.new(@end_time.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          # conversion for end [type = org.joda.time.LocalDate]
+          if !@end.nil?
+            @end = Java::org.joda.time.LocalDate.parse(@end.to_s)
           end
 
-          # conversion for amount [type = java.math.BigDecimal]
-          if @amount.nil?
-            @amount = java.math.BigDecimal::ZERO
-          else
-            @amount = java.math.BigDecimal.new(@amount.to_s)
+          # conversion for rolled_up_units [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@rolled_up_units || []).each do |m|
+            # conversion for m [type = org.killbill.billing.usage.api.RolledUpUnit]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
           end
+          @rolled_up_units = tmp
           self
         end
 
@@ -72,28 +69,27 @@ module Killbill
           @subscription_id = j_obj.subscription_id
           @subscription_id = @subscription_id.nil? ? nil : @subscription_id.to_s
 
-          # conversion for unit_type [type = java.lang.String]
-          @unit_type = j_obj.unit_type
-
-          # conversion for start_time [type = org.joda.time.DateTime]
-          @start_time = j_obj.start_time
-          if !@start_time.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(@start_time)
-            @start_time = DateTime.iso8601(str)
+          # conversion for start [type = org.joda.time.LocalDate]
+          @start = j_obj.start
+          if !@start.nil?
+            @start = @start.to_s
           end
 
-          # conversion for end_time [type = org.joda.time.DateTime]
-          @end_time = j_obj.end_time
-          if !@end_time.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(@end_time)
-            @end_time = DateTime.iso8601(str)
+          # conversion for end [type = org.joda.time.LocalDate]
+          @end = j_obj.end
+          if !@end.nil?
+            @end = @end.to_s
           end
 
-          # conversion for amount [type = java.math.BigDecimal]
-          @amount = j_obj.amount
-          @amount = @amount.nil? ? 0 : BigDecimal.new(@amount.to_s)
+          # conversion for rolled_up_units [type = java.util.List]
+          @rolled_up_units = j_obj.rolled_up_units
+          tmp = []
+          (@rolled_up_units || []).each do |m|
+            # conversion for m [type = org.killbill.billing.usage.api.RolledUpUnit]
+            m = Killbill::Plugin::Model::RolledUpUnit.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @rolled_up_units = tmp
           self
         end
 

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.catalog.api.StaticCatalog
 
-        attr_accessor :catalog_name, :recurring_billing_mode, :effective_date, :current_supported_currencies, :current_products, :current_units, :current_plans, :available_base_plan_listings, :available_addon_listings
+        attr_accessor :catalog_name, :recurring_billing_mode, :effective_date, :current_supported_currencies, :current_products, :current_units, :current_plans, :available_base_plan_listings, :available_add_on_listings
 
         def initialize()
         end
@@ -74,14 +74,14 @@ module Killbill
           end
           @available_base_plan_listings = tmp
 
-          # conversion for available_addon_listings [type = java.util.List]
+          # conversion for available_add_on_listings [type = java.util.List]
           tmp = java.util.ArrayList.new
-          (@available_addon_listings || []).each do |m|
+          (@available_add_on_listings || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Listing]
             m = m.to_java unless m.nil?
             tmp.add(m)
           end
-          @available_addon_listings = tmp
+          @available_add_on_listings = tmp
           self
         end
 
@@ -128,15 +128,15 @@ module Killbill
           end
           @available_base_plan_listings = tmp
 
-          # conversion for available_addon_listings [type = java.util.List]
-          @available_addon_listings = j_obj.available_addon_listings
+          # conversion for available_add_on_listings [type = java.util.List]
+          @available_add_on_listings = j_obj.available_add_on_listings
           tmp = []
-          (@available_addon_listings || []).each do |m|
+          (@available_add_on_listings || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Listing]
             m = Killbill::Plugin::Model::Listing.new.to_ruby(m) unless m.nil?
             tmp << m
           end
-          @available_addon_listings = tmp
+          @available_add_on_listings = tmp
           self
         end
 

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

@@ -0,0 +1,75 @@
+#############################################################################################
+#                                                                                           #
+#                   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 Model
+
+      class SubscriptionUsageRecord
+
+
+        attr_accessor :subscription_id, :unit_usage_record
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for subscription_id [type = java.util.UUID]
+          @subscription_id = java.util.UUID.fromString(@subscription_id.to_s) unless @subscription_id.nil?
+
+          # conversion for unit_usage_record [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@unit_usage_record || []).each do |m|
+            # conversion for m [type = org.killbill.billing.usage.api.UnitUsageRecord]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @unit_usage_record = tmp
+          Java::org.killbill.billing.usage.api.SubscriptionUsageRecord.new(@subscription_id, @unit_usage_record)
+        end
+
+        def to_ruby(j_obj)
+          # conversion for subscription_id [type = java.util.UUID]
+          @subscription_id = j_obj.subscription_id
+          @subscription_id = @subscription_id.nil? ? nil : @subscription_id.to_s
+
+          # conversion for unit_usage_record [type = java.util.List]
+          @unit_usage_record = j_obj.unit_usage_record
+          tmp = []
+          (@unit_usage_record || []).each do |m|
+            # conversion for m [type = org.killbill.billing.usage.api.UnitUsageRecord]
+            m = Killbill::Plugin::Model::UnitUsageRecord.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @unit_usage_record = tmp
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,74 @@
+#############################################################################################
+#                                                                                           #
+#                   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 Model
+
+      class UnitUsageRecord
+
+
+        attr_accessor :unit_type, :daily_amount
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for unit_type [type = java.lang.String]
+          @unit_type = @unit_type.to_s unless @unit_type.nil?
+
+          # conversion for daily_amount [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@daily_amount || []).each do |m|
+            # conversion for m [type = org.killbill.billing.usage.api.UsageRecord]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @daily_amount = tmp
+          Java::org.killbill.billing.usage.api.UnitUsageRecord.new(@unit_type, @daily_amount)
+        end
+
+        def to_ruby(j_obj)
+          # conversion for unit_type [type = java.lang.String]
+          @unit_type = j_obj.unit_type
+
+          # conversion for daily_amount [type = java.util.List]
+          @daily_amount = j_obj.daily_amount
+          tmp = []
+          (@daily_amount || []).each do |m|
+            # conversion for m [type = org.killbill.billing.usage.api.UsageRecord]
+            m = Killbill::Plugin::Model::UsageRecord.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @daily_amount = tmp
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,66 @@
+#############################################################################################
+#                                                                                           #
+#                   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 Model
+
+      class UsageRecord
+
+
+        attr_accessor :date, :amount
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for date [type = org.joda.time.LocalDate]
+          if !@date.nil?
+            @date = Java::org.joda.time.LocalDate.parse(@date.to_s)
+          end
+
+          # conversion for amount [type = java.lang.Long]
+          @amount = @amount
+          Java::org.killbill.billing.usage.api.UsageRecord.new(@date, @amount)
+        end
+
+        def to_ruby(j_obj)
+          # conversion for date [type = org.joda.time.LocalDate]
+          @date = j_obj.date
+          if !@date.nil?
+            @date = @date.to_s
+          end
+
+          # conversion for amount [type = java.lang.Long]
+          @amount = j_obj.amount
+          self
+        end
+
+      end
+    end
+  end
+end