killbill 8.3.6 → 9.2.0

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
+        attr_accessor :catalog_name, :effective_date, :current_supported_currencies, :current_products, :current_units, :current_plans, :available_base_plan_listings
 
         def initialize()
         end
@@ -43,9 +43,6 @@ 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
@@ -104,10 +101,6 @@ 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/tag_user_api.rb

@@ -56,8 +56,8 @@ module Killbill
           return res
         end
 
-        java_signature 'Java::org.killbill.billing.util.tag.TagDefinition createTagDefinition(Java::java.lang.String, Java::java.lang.String, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def create_tag_definition(definitionName, description, context)
+        java_signature 'Java::org.killbill.billing.util.tag.TagDefinition createTagDefinition(Java::java.lang.String, Java::java.lang.String, Java::java.util.Set, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def create_tag_definition(definitionName, description, applicableObjectTypes, context)
 
           # conversion for definitionName [type = java.lang.String]
           definitionName = definitionName.to_s unless definitionName.nil?
@@ -65,10 +65,19 @@ module Killbill
           # conversion for description [type = java.lang.String]
           description = description.to_s unless description.nil?
 
+          # conversion for applicableObjectTypes [type = java.util.Set]
+          tmp = java.util.TreeSet.new
+          (applicableObjectTypes || []).each do |m|
+            # conversion for m [type = org.killbill.billing.ObjectType]
+            m = Java::org.killbill.billing.ObjectType.value_of( m.to_s ) unless m.nil?
+            tmp.add(m)
+          end
+          applicableObjectTypes = tmp
+
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.create_tag_definition(definitionName, description, context)
+            res = @real_java_api.create_tag_definition(definitionName, description, applicableObjectTypes, context)
             # conversion for res [type = org.killbill.billing.util.tag.TagDefinition]
             res = Killbill::Plugin::Model::TagDefinition.new.to_ruby(res) unless res.nil?
             return res

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

@@ -34,18 +34,25 @@ module Killbill
 
         include org.killbill.billing.util.callcontext.TenantContext
 
-        attr_accessor :tenant_id
+        attr_accessor :account_id, :tenant_id
 
         def initialize()
         end
 
         def to_java()
+          # conversion for account_id [type = java.util.UUID]
+          @account_id = java.util.UUID.fromString(@account_id.to_s) unless @account_id.nil?
+
           # conversion for tenant_id [type = java.util.UUID]
           @tenant_id = java.util.UUID.fromString(@tenant_id.to_s) unless @tenant_id.nil?
           self
         end
 
         def to_ruby(j_obj)
+          # conversion for account_id [type = java.util.UUID]
+          @account_id = j_obj.account_id
+          @account_id = @account_id.nil? ? nil : @account_id.to_s
+
           # conversion for tenant_id [type = java.util.UUID]
           @tenant_id = j_obj.tenant_id
           @tenant_id = @tenant_id.nil? ? nil : @tenant_id.to_s

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

@@ -0,0 +1,70 @@
+#############################################################################################
+#                                                                                           #
+#                   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.catalog.api'
+      class TierPriceOverride
+
+        include org.killbill.billing.catalog.api.TierPriceOverride
+
+        attr_accessor :tiered_block_price_overrides
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for tiered_block_price_overrides [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@tiered_block_price_overrides || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.TieredBlockPriceOverride]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @tiered_block_price_overrides = tmp
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for tiered_block_price_overrides [type = java.util.List]
+          @tiered_block_price_overrides = j_obj.tiered_block_price_overrides
+          tmp = []
+          (@tiered_block_price_overrides || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.TieredBlockPriceOverride]
+            m = Killbill::Plugin::Model::TieredBlockPriceOverride.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @tiered_block_price_overrides = tmp
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,87 @@
+#############################################################################################
+#                                                                                           #
+#                   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.catalog.api'
+      class TieredBlockPriceOverride
+
+        include org.killbill.billing.catalog.api.TieredBlockPriceOverride
+
+        attr_accessor :unit_name, :size, :price, :currency, :max
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for unit_name [type = java.lang.String]
+          @unit_name = @unit_name.to_s unless @unit_name.nil?
+
+          # conversion for size [type = java.lang.Double]
+          @size = @size
+
+          # conversion for price [type = java.math.BigDecimal]
+          if @price.nil?
+            @price = java.math.BigDecimal::ZERO
+          else
+            @price = java.math.BigDecimal.new(@price.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 max [type = java.lang.Double]
+          @max = @max
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for unit_name [type = java.lang.String]
+          @unit_name = j_obj.unit_name
+
+          # conversion for size [type = java.lang.Double]
+          @size = j_obj.size
+
+          # conversion for price [type = java.math.BigDecimal]
+          @price = j_obj.price
+          @price = @price.nil? ? 0 : BigDecimal.new(@price.to_s)
+
+          # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
+          @currency = j_obj.currency
+          @currency = @currency.to_s.to_sym unless @currency.nil?
+
+          # conversion for max [type = java.lang.Double]
+          @max = j_obj.max
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.catalog.api.Unit
 
-        attr_accessor :name
+        attr_accessor :name, :pretty_name
 
         def initialize()
         end
@@ -42,12 +42,18 @@ module Killbill
         def to_java()
           # conversion for name [type = java.lang.String]
           @name = @name.to_s unless @name.nil?
+
+          # conversion for pretty_name [type = java.lang.String]
+          @pretty_name = @pretty_name.to_s unless @pretty_name.nil?
           self
         end
 
         def to_ruby(j_obj)
           # conversion for name [type = java.lang.String]
           @name = j_obj.name
+
+          # conversion for pretty_name [type = java.lang.String]
+          @pretty_name = j_obj.pretty_name
           self
         end
 

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.catalog.api.Usage
 
-        attr_accessor :name, :billing_mode, :usage_type, :billing_period, :limits, :tiers, :blocks, :fixed_price, :recurring_price
+        attr_accessor :name, :pretty_name, :billing_mode, :usage_type, :tier_block_policy, :billing_period, :limits, :tiers, :blocks, :fixed_price, :recurring_price
 
         def initialize()
         end
@@ -43,12 +43,18 @@ module Killbill
           # conversion for name [type = java.lang.String]
           @name = @name.to_s unless @name.nil?
 
+          # conversion for pretty_name [type = java.lang.String]
+          @pretty_name = @pretty_name.to_s unless @pretty_name.nil?
+
           # conversion for billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
           @billing_mode = Java::org.killbill.billing.catalog.api.BillingMode.value_of( @billing_mode.to_s ) unless @billing_mode.nil?
 
           # conversion for usage_type [type = org.killbill.billing.catalog.api.UsageType]
           @usage_type = Java::org.killbill.billing.catalog.api.UsageType.value_of( @usage_type.to_s ) unless @usage_type.nil?
 
+          # conversion for tier_block_policy [type = org.killbill.billing.catalog.api.TierBlockPolicy]
+          @tier_block_policy = Java::org.killbill.billing.catalog.api.TierBlockPolicy.value_of( @tier_block_policy.to_s ) unless @tier_block_policy.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?
 
@@ -91,6 +97,9 @@ module Killbill
           # conversion for name [type = java.lang.String]
           @name = j_obj.name
 
+          # conversion for pretty_name [type = java.lang.String]
+          @pretty_name = j_obj.pretty_name
+
           # conversion for billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
           @billing_mode = j_obj.billing_mode
           @billing_mode = @billing_mode.to_s.to_sym unless @billing_mode.nil?
@@ -99,6 +108,10 @@ module Killbill
           @usage_type = j_obj.usage_type
           @usage_type = @usage_type.to_s.to_sym unless @usage_type.nil?
 
+          # conversion for tier_block_policy [type = org.killbill.billing.catalog.api.TierBlockPolicy]
+          @tier_block_policy = j_obj.tier_block_policy
+          @tier_block_policy = @tier_block_policy.to_s.to_sym unless @tier_block_policy.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?

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

@@ -0,0 +1,83 @@
+#############################################################################################
+#                                                                                           #
+#                   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.catalog.api'
+      class UsagePriceOverride
+
+        include org.killbill.billing.catalog.api.UsagePriceOverride
+
+        attr_accessor :name, :usage_type, :tier_price_overrides
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for name [type = java.lang.String]
+          @name = @name.to_s unless @name.nil?
+
+          # conversion for usage_type [type = org.killbill.billing.catalog.api.UsageType]
+          @usage_type = Java::org.killbill.billing.catalog.api.UsageType.value_of( @usage_type.to_s ) unless @usage_type.nil?
+
+          # conversion for tier_price_overrides [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@tier_price_overrides || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.TierPriceOverride]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @tier_price_overrides = tmp
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for name [type = java.lang.String]
+          @name = j_obj.name
+
+          # conversion for usage_type [type = org.killbill.billing.catalog.api.UsageType]
+          @usage_type = j_obj.usage_type
+          @usage_type = @usage_type.to_s.to_sym unless @usage_type.nil?
+
+          # conversion for tier_price_overrides [type = java.util.List]
+          @tier_price_overrides = j_obj.tier_price_overrides
+          tmp = []
+          (@tier_price_overrides || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.TierPriceOverride]
+            m = Killbill::Plugin::Model::TierPriceOverride.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @tier_price_overrides = tmp
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -40,6 +40,40 @@ module Killbill
         end
 
 
+        java_signature 'Java::org.joda.time.DateTime getLatestCatalogVersion(Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.TenantContext)'
+        def get_latest_catalog_version(properties, context)
+
+          # conversion for properties [type = java.lang.Iterable]
+          tmp = []
+          (properties.nil? ? [] : properties.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
+          properties = tmp
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
+          context = Killbill::Plugin::Model::TenantContext.new.to_ruby(context) unless context.nil?
+          begin
+            res = @delegate_plugin.get_latest_catalog_version(properties, context)
+            # conversion for res [type = org.joda.time.DateTime]
+            if !res.nil?
+              res =  (res.kind_of? Time) ? DateTime.parse(res.to_s) : res
+              res = Java::org.joda.time.DateTime.new(res.to_s, Java::org.joda.time.DateTimeZone::UTC)
+            end
+            return res
+          rescue Exception => e
+            message = "Failure in get_latest_catalog_version: #{e}"
+            unless e.backtrace.nil?
+              message = "#{message}\n#{e.backtrace.join("\n")}"
+            end
+            logger.warn message
+            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_latest_catalog_version failure", e.message)
+          ensure
+            @delegate_plugin.after_request
+          end
+        end
+
         java_signature 'Java::org.killbill.billing.catalog.plugin.api.VersionedPluginCatalog getVersionedPluginCatalog(Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.TenantContext)'
         def get_versioned_plugin_catalog(properties, context)