killbill 3.0.0 → 3.1.0

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

@@ -50,7 +50,7 @@ module Killbill
           # 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.PaymentMethodKVInfo]
+            # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
             m = m.to_java unless m.nil?
             tmp.add(m)
           end
@@ -115,8 +115,8 @@ module Killbill
           @properties = j_obj.properties
           tmp = []
           (@properties || []).each do |m|
-            # conversion for m [type = org.killbill.billing.payment.api.PaymentMethodKVInfo]
-            m = Killbill::Plugin::Model::PaymentMethodKVInfo.new.to_ruby(m) unless m.nil?
+            # 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

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

@@ -32,7 +32,7 @@ module Killbill
 
         include org.killbill.billing.catalog.api.Plan
 
-        attr_accessor :initial_phases, :product, :name, :is_retired, :initial_phase_iterator, :final_phase, :billing_period, :plans_allowed_in_bundle, :all_phases, :effective_date_for_existing_subscriptons
+        attr_accessor :initial_phases, :product, :name, :is_retired, :initial_phase_iterator, :final_phase, :recurring_billing_period, :plans_allowed_in_bundle, :all_phases, :effective_date_for_existing_subscriptons
 
         def initialize()
         end
@@ -56,8 +56,8 @@ module Killbill
           # conversion for final_phase [type = org.killbill.billing.catalog.api.PlanPhase]
           @final_phase = @final_phase.to_java unless @final_phase.nil?
 
-          # conversion for billing_period [type = org.killbill.billing.catalog.api.BillingPeriod]
-          @billing_period = Java::org.killbill.billing.catalog.api.BillingPeriod.value_of("#{@billing_period.to_s}") unless @billing_period.nil?
+          # conversion for recurring_billing_period [type = org.killbill.billing.catalog.api.BillingPeriod]
+          @recurring_billing_period = Java::org.killbill.billing.catalog.api.BillingPeriod.value_of("#{@recurring_billing_period.to_s}") unless @recurring_billing_period.nil?
 
           # conversion for plans_allowed_in_bundle [type = int]
           @plans_allowed_in_bundle = @plans_allowed_in_bundle
@@ -102,9 +102,9 @@ module Killbill
           @final_phase = j_obj.final_phase
           @final_phase = Killbill::Plugin::Model::PlanPhase.new.to_ruby(@final_phase) unless @final_phase.nil?
 
-          # conversion for billing_period [type = org.killbill.billing.catalog.api.BillingPeriod]
-          @billing_period = j_obj.billing_period
-          @billing_period = @billing_period.to_s.to_sym unless @billing_period.nil?
+          # conversion for recurring_billing_period [type = org.killbill.billing.catalog.api.BillingPeriod]
+          @recurring_billing_period = j_obj.recurring_billing_period
+          @recurring_billing_period = @recurring_billing_period.to_s.to_sym unless @recurring_billing_period.nil?
 
           # conversion for plans_allowed_in_bundle [type = int]
           @plans_allowed_in_bundle = j_obj.plans_allowed_in_bundle

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

@@ -32,20 +32,20 @@ module Killbill
 
         include org.killbill.billing.catalog.api.PlanPhase
 
-        attr_accessor :recurring_price, :fixed_price, :billing_period, :name, :plan, :duration, :phase_type, :limits
+        attr_accessor :fixed, :recurring, :usages, :name, :plan, :duration, :phase_type
 
         def initialize()
         end
 
         def to_java()
-          # conversion for recurring_price [type = org.killbill.billing.catalog.api.InternationalPrice]
-          @recurring_price = @recurring_price.to_java unless @recurring_price.nil?
+          # conversion for fixed [type = org.killbill.billing.catalog.api.Fixed]
+          @fixed = @fixed.to_java unless @fixed.nil?
 
-          # conversion for fixed_price [type = org.killbill.billing.catalog.api.InternationalPrice]
-          @fixed_price = @fixed_price.to_java unless @fixed_price.nil?
+          # conversion for recurring [type = org.killbill.billing.catalog.api.Recurring]
+          @recurring = @recurring.to_java unless @recurring.nil?
 
-          # conversion for billing_period [type = org.killbill.billing.catalog.api.BillingPeriod]
-          @billing_period = Java::org.killbill.billing.catalog.api.BillingPeriod.value_of("#{@billing_period.to_s}") unless @billing_period.nil?
+          # conversion for usages [type = org.killbill.billing.catalog.api.Usage]
+          @usages = @usages.to_java unless @usages.nil?
 
           # conversion for name [type = java.lang.String]
           @name = @name.to_s unless @name.nil?
@@ -58,24 +58,21 @@ module Killbill
 
           # conversion for phase_type [type = org.killbill.billing.catalog.api.PhaseType]
           @phase_type = Java::org.killbill.billing.catalog.api.PhaseType.value_of("#{@phase_type.to_s}") unless @phase_type.nil?
-
-          # conversion for limits [type = org.killbill.billing.catalog.api.Limit]
-          @limits = @limits.to_java unless @limits.nil?
           self
         end
 
         def to_ruby(j_obj)
-          # conversion for recurring_price [type = org.killbill.billing.catalog.api.InternationalPrice]
-          @recurring_price = j_obj.recurring_price
-          @recurring_price = Killbill::Plugin::Model::InternationalPrice.new.to_ruby(@recurring_price) unless @recurring_price.nil?
+          # conversion for fixed [type = org.killbill.billing.catalog.api.Fixed]
+          @fixed = j_obj.fixed
+          @fixed = Killbill::Plugin::Model::Fixed.new.to_ruby(@fixed) unless @fixed.nil?
 
-          # conversion for fixed_price [type = org.killbill.billing.catalog.api.InternationalPrice]
-          @fixed_price = j_obj.fixed_price
-          @fixed_price = Killbill::Plugin::Model::InternationalPrice.new.to_ruby(@fixed_price) unless @fixed_price.nil?
+          # conversion for recurring [type = org.killbill.billing.catalog.api.Recurring]
+          @recurring = j_obj.recurring
+          @recurring = Killbill::Plugin::Model::Recurring.new.to_ruby(@recurring) unless @recurring.nil?
 
-          # conversion for billing_period [type = org.killbill.billing.catalog.api.BillingPeriod]
-          @billing_period = j_obj.billing_period
-          @billing_period = @billing_period.to_s.to_sym unless @billing_period.nil?
+          # conversion for usages [type = org.killbill.billing.catalog.api.Usage]
+          @usages = j_obj.usages
+          @usages = Killbill::Plugin::Model::Usage.new.to_ruby(@usages) unless @usages.nil?
 
           # conversion for name [type = java.lang.String]
           @name = j_obj.name
@@ -91,10 +88,6 @@ module Killbill
           # conversion for phase_type [type = org.killbill.billing.catalog.api.PhaseType]
           @phase_type = j_obj.phase_type
           @phase_type = @phase_type.to_s.to_sym unless @phase_type.nil?
-
-          # conversion for limits [type = org.killbill.billing.catalog.api.Limit]
-          @limits = j_obj.limits
-          @limits = Killbill::Plugin::Model::Limit.new.to_ruby(@limits) unless @limits.nil?
           self
         end
 

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

@@ -0,0 +1,71 @@
+###################################################################################
+#                                                                                 #
+#                   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 PluginProperty
+
+
+        attr_accessor :key, :value, :is_updatable
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for key [type = java.lang.String]
+          @key = @key.to_s unless @key.nil?
+
+          # conversion for value [type = java.lang.Object]
+          @value = @value.to_s unless @value.nil?
+
+          # conversion for is_updatable [type = java.lang.Boolean]
+          @is_updatable = @is_updatable.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_updatable)
+          Java::org.killbill.billing.payment.api.PluginProperty.new(@key, @value, @is_updatable)
+        end
+
+        def to_ruby(j_obj)
+          # conversion for key [type = java.lang.String]
+          @key = j_obj.key
+
+          # conversion for value [type = java.lang.Object]
+          @value = j_obj.value
+
+          # conversion for is_updatable [type = java.lang.Boolean]
+          @is_updatable = j_obj.is_updatable
+          if @is_updatable.nil?
+            @is_updatable = false
+          else
+            tmp_bool = (@is_updatable.java_kind_of? java.lang.Boolean) ? @is_updatable.boolean_value : @is_updatable
+            @is_updatable = tmp_bool ? true : false
+          end
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,63 @@
+###################################################################################
+#                                                                                 #
+#                   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.catalog.api'
+      class Recurring
+
+        include org.killbill.billing.catalog.api.Recurring
+
+        attr_accessor :billing_period, :recurring_price
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for billing_period [type = org.killbill.billing.catalog.api.BillingPeriod]
+          @billing_period = Java::org.killbill.billing.catalog.api.BillingPeriod.value_of("#{@billing_period.to_s}") unless @billing_period.nil?
+
+          # conversion for recurring_price [type = org.killbill.billing.catalog.api.InternationalPrice]
+          @recurring_price = @recurring_price.to_java unless @recurring_price.nil?
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for billing_period [type = org.killbill.billing.catalog.api.BillingPeriod]
+          @billing_period = j_obj.billing_period
+          @billing_period = @billing_period.to_s.to_sym unless @billing_period.nil?
+
+          # conversion for recurring_price [type = org.killbill.billing.catalog.api.InternationalPrice]
+          @recurring_price = j_obj.recurring_price
+          @recurring_price = Killbill::Plugin::Model::InternationalPrice.new.to_ruby(@recurring_price) unless @recurring_price.nil?
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -30,11 +30,13 @@ require 'killbill/gen/api/account_email'
 require 'killbill/gen/api/account_user_api'
 require 'killbill/gen/api/mutable_account_data'
 require 'killbill/gen/api/billing_exception_base'
+require 'killbill/gen/api/block'
 require 'killbill/gen/api/catalog'
 require 'killbill/gen/api/catalog_api_exception'
 require 'killbill/gen/api/catalog_user_api'
 require 'killbill/gen/api/currency_value_null'
 require 'killbill/gen/api/duration'
+require 'killbill/gen/api/fixed'
 require 'killbill/gen/api/illegal_plan_change'
 require 'killbill/gen/api/international_price'
 require 'killbill/gen/api/invalid_config_exception'
@@ -50,8 +52,12 @@ require 'killbill/gen/api/price'
 require 'killbill/gen/api/price_list'
 require 'killbill/gen/api/price_list_set'
 require 'killbill/gen/api/product'
+require 'killbill/gen/api/recurring'
 require 'killbill/gen/api/static_catalog'
+require 'killbill/gen/api/tier'
+require 'killbill/gen/api/tiered_block'
 require 'killbill/gen/api/unit'
+require 'killbill/gen/api/usage'
 require 'killbill/gen/api/currency_conversion'
 require 'killbill/gen/api/currency_conversion_api'
 require 'killbill/gen/api/currency_conversion_exception'
@@ -81,13 +87,16 @@ require 'killbill/gen/api/invoice_user_api'
 require 'killbill/gen/api/plugin_config_service_api'
 require 'killbill/gen/api/osgi_killbill'
 require 'killbill/gen/api/osgi_plugin_properties'
+require 'killbill/gen/api/direct_payment'
+require 'killbill/gen/api/direct_payment_api'
+require 'killbill/gen/api/direct_payment_transaction'
 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_method'
-require 'killbill/gen/api/payment_method_kv_info'
 require 'killbill/gen/api/payment_method_plugin'
+require 'killbill/gen/api/plugin_property'
 require 'killbill/gen/api/refund'
 require 'killbill/gen/api/security_api_exception'
 require 'killbill/gen/api/tenant'

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

@@ -32,7 +32,7 @@ module Killbill
 
         include org.killbill.billing.catalog.api.StaticCatalog
 
-        attr_accessor :catalog_name, :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_addon_listings
 
         def initialize()
         end
@@ -41,6 +41,9 @@ module Killbill
           # conversion for catalog_name [type = java.lang.String]
           @catalog_name = @catalog_name.to_s unless @catalog_name.nil?
 
+          # conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
+          @recurring_billing_mode = Java::org.killbill.billing.catalog.api.BillingMode.value_of("#{@recurring_billing_mode.to_s}") unless @recurring_billing_mode.nil?
+
           # conversion for effective_date [type = java.util.Date]
           if !@effective_date.nil?
             @effective_date =  (@effective_date.kind_of? Time) ? DateTime.parse(@effective_date.to_s) : @effective_date
@@ -84,6 +87,10 @@ module Killbill
           # conversion for catalog_name [type = java.lang.String]
           @catalog_name = j_obj.catalog_name
 
+          # conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
+          @recurring_billing_mode = j_obj.recurring_billing_mode
+          @recurring_billing_mode = @recurring_billing_mode.to_s.to_sym unless @recurring_billing_mode.nil?
+
           # conversion for effective_date [type = java.util.Date]
           @effective_date = j_obj.effective_date
           if !@effective_date.nil?

data/lib/killbill/gen/api/tier.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 'org.killbill.billing.catalog.api'
+      class Tier
+
+        include org.killbill.billing.catalog.api.Tier
+
+        attr_accessor :limits, :tiered_blocks, :fixed_price, :recurring_price
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for limits [type = org.killbill.billing.catalog.api.Limit]
+          @limits = @limits.to_java unless @limits.nil?
+
+          # conversion for tiered_blocks [type = org.killbill.billing.catalog.api.TieredBlock]
+          @tiered_blocks = @tiered_blocks.to_java unless @tiered_blocks.nil?
+
+          # conversion for fixed_price [type = org.killbill.billing.catalog.api.InternationalPrice]
+          @fixed_price = @fixed_price.to_java unless @fixed_price.nil?
+
+          # conversion for recurring_price [type = org.killbill.billing.catalog.api.InternationalPrice]
+          @recurring_price = @recurring_price.to_java unless @recurring_price.nil?
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for limits [type = org.killbill.billing.catalog.api.Limit]
+          @limits = j_obj.limits
+          @limits = Killbill::Plugin::Model::Limit.new.to_ruby(@limits) unless @limits.nil?
+
+          # conversion for tiered_blocks [type = org.killbill.billing.catalog.api.TieredBlock]
+          @tiered_blocks = j_obj.tiered_blocks
+          @tiered_blocks = Killbill::Plugin::Model::TieredBlock.new.to_ruby(@tiered_blocks) unless @tiered_blocks.nil?
+
+          # conversion for fixed_price [type = org.killbill.billing.catalog.api.InternationalPrice]
+          @fixed_price = j_obj.fixed_price
+          @fixed_price = Killbill::Plugin::Model::InternationalPrice.new.to_ruby(@fixed_price) unless @fixed_price.nil?
+
+          # conversion for recurring_price [type = org.killbill.billing.catalog.api.InternationalPrice]
+          @recurring_price = j_obj.recurring_price
+          @recurring_price = Killbill::Plugin::Model::InternationalPrice.new.to_ruby(@recurring_price) unless @recurring_price.nil?
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,88 @@
+###################################################################################
+#                                                                                 #
+#                   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.catalog.api'
+      class TieredBlock
+
+        include org.killbill.billing.catalog.api.TieredBlock
+
+        attr_accessor :type, :unit, :size, :price, :min_top_up_credit, :max
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for type [type = org.killbill.billing.catalog.api.BlockType]
+          @type = Java::org.killbill.billing.catalog.api.BlockType.value_of("#{@type.to_s}") unless @type.nil?
+
+          # conversion for unit [type = org.killbill.billing.catalog.api.Unit]
+          @unit = @unit.to_java unless @unit.nil?
+
+          # conversion for size [type = java.lang.Double]
+          @size = @size
+
+          # conversion for price [type = org.killbill.billing.catalog.api.InternationalPrice]
+          @price = @price.to_java unless @price.nil?
+
+          # conversion for min_top_up_credit [type = java.lang.Double]
+          @min_top_up_credit = @min_top_up_credit
+
+          # conversion for max [type = java.lang.Double]
+          @max = @max
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for type [type = org.killbill.billing.catalog.api.BlockType]
+          @type = j_obj.type
+          @type = @type.to_s.to_sym unless @type.nil?
+
+          # conversion for unit [type = org.killbill.billing.catalog.api.Unit]
+          @unit = j_obj.unit
+          @unit = Killbill::Plugin::Model::Unit.new.to_ruby(@unit) unless @unit.nil?
+
+          # conversion for size [type = java.lang.Double]
+          @size = j_obj.size
+
+          # conversion for price [type = org.killbill.billing.catalog.api.InternationalPrice]
+          @price = j_obj.price
+          @price = Killbill::Plugin::Model::InternationalPrice.new.to_ruby(@price) unless @price.nil?
+
+          # conversion for min_top_up_credit [type = java.lang.Double]
+          @min_top_up_credit = j_obj.min_top_up_credit
+
+          # conversion for max [type = java.lang.Double]
+          @max = j_obj.max
+          self
+        end
+
+      end
+    end
+  end
+end