killbill 1.6.0 → 1.7.0

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

@@ -429,23 +429,23 @@ module Killbill
         end
       end
 
-      java_signature 'Java::java.util.List searchPaymentMethods(Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
-      def search_payment_methods(searchKey, context)
+      java_signature 'Java::com.ning.billing.util.entity.Pagination searchPaymentMethods(Java::java.lang.String, Java::java.lang.Long, Java::java.lang.Long, Java::com.ning.billing.util.callcontext.TenantContext)'
+      def search_payment_methods(searchKey, offset, limit, context)
 
         # conversion for searchKey [type = java.lang.String]
         searchKey = searchKey.to_s unless searchKey.nil?
 
+        # conversion for offset [type = java.lang.Long]
+        offset = offset
+
+        # conversion for limit [type = java.lang.Long]
+        limit = limit
+
         # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
         context = context.to_java unless context.nil?
-        res = @real_java_api.search_payment_methods(searchKey, context)
-        # conversion for res [type = java.util.List]
-        tmp = []
-        (res || []).each do |m|
-          # conversion for m [type = com.ning.billing.payment.api.PaymentMethod]
-          m = Killbill::Plugin::Model::PaymentMethod.new.to_ruby(m) unless m.nil?
-          tmp << m
-        end
-        res = tmp
+        res = @real_java_api.search_payment_methods(searchKey, offset, limit, context)
+        # conversion for res [type = com.ning.billing.util.entity.Pagination]
+        res = Killbill::Plugin::Model::Pagination.new.to_ruby(res) unless res.nil?
         return res
       end
 

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

@@ -51,13 +51,7 @@ module Killbill
           @is_retired = @is_retired.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_retired)
 
           # conversion for initial_phase_iterator [type = java.util.Iterator]
-          tmp = java.util.ArrayList.new
-          (@initial_phase_iterator || []).each do |m|
-            # conversion for m [type = com.ning.billing.catalog.api.PlanPhase]
-            m = m.to_java unless m.nil?
-            tmp.add(m)
-          end
-          @initial_phase_iterator = tmp
+          @initial_phase_iterator = Killbill::Plugin::Model::EnumeratorIterator.new(@initial_phase_iterator)
 
           # conversion for final_phase [type = com.ning.billing.catalog.api.PlanPhase]
           @final_phase = @final_phase.to_java unless @final_phase.nil?
@@ -103,13 +97,6 @@ module Killbill
 
           # conversion for initial_phase_iterator [type = java.util.Iterator]
           @initial_phase_iterator = j_obj.initial_phase_iterator
-          tmp = []
-          (@initial_phase_iterator || []).each do |m|
-            # conversion for m [type = com.ning.billing.catalog.api.PlanPhase]
-            m = Killbill::Plugin::Model::PlanPhase.new.to_ruby(m) unless m.nil?
-            tmp << m
-          end
-          @initial_phase_iterator = tmp
 
           # conversion for final_phase [type = com.ning.billing.catalog.api.PlanPhase]
           @final_phase = j_obj.final_phase

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

@@ -85,6 +85,7 @@ 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/refund'
+require 'killbill/gen/api/security_api_exception'
 require 'killbill/gen/api/tenant'
 require 'killbill/gen/api/tenant_api_exception'
 require 'killbill/gen/api/tenant_data'
@@ -105,6 +106,8 @@ require 'killbill/gen/api/call_context'
 require 'killbill/gen/api/tenant_context'
 require 'killbill/gen/api/custom_field'
 require 'killbill/gen/api/entity'
+require 'killbill/gen/api/pagination'
 require 'killbill/gen/api/control_tag'
 require 'killbill/gen/api/tag'
 require 'killbill/gen/api/tag_definition'
+require 'killbill/gen/api/enumerator_iterator'

data/lib/killbill/gen/api/{subscription_user_api_exception.rb → security_api_exception.rb}

@@ -27,7 +27,7 @@ module Killbill
   module Plugin
     module Model
 
-      class SubscriptionUserApiException
+      class SecurityApiException
 
 
         attr_accessor :message, :cause, :code
@@ -44,7 +44,7 @@ module Killbill
 
           # conversion for code [type = int]
           @code = @code
-          Java::com.ning.billing.subscription.api.user.SubscriptionUserApiException.new(@message, @cause, @code)
+          Java::com.ning.billing.security.SecurityApiException.new(@message, @cause, @code)
         end
 
         def to_ruby(j_obj)

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

@@ -32,7 +32,7 @@ module Killbill
 
         include com.ning.billing.entitlement.api.Subscription
 
-        attr_accessor :base_entitlement_id, :bundle_id, :account_id, :external_key, :state, :source_type, :effective_start_date, :effective_end_date, :product, :plan, :price_list, :current_phase, :product_category, :last_active_product, :last_active_plan, :last_active_price_list, :last_active_product_category, :id, :created_date, :updated_date, :billing_start_date, :billing_end_date, :charged_through_date, :bcd, :current_state_for_service
+        attr_accessor :base_entitlement_id, :bundle_id, :account_id, :external_key, :state, :source_type, :effective_start_date, :effective_end_date, :last_active_product, :last_active_plan, :last_active_phase, :last_active_price_list, :last_active_product_category, :id, :created_date, :updated_date, :billing_start_date, :billing_end_date, :charged_through_date, :current_state_for_service
 
         def initialize()
         end
@@ -66,27 +66,15 @@ module Killbill
             @effective_end_date = Java::org.joda.time.LocalDate.parse(@effective_end_date.to_s)
           end
 
-          # conversion for product [type = com.ning.billing.catalog.api.Product]
-          @product = @product.to_java unless @product.nil?
-
-          # conversion for plan [type = com.ning.billing.catalog.api.Plan]
-          @plan = @plan.to_java unless @plan.nil?
-
-          # conversion for price_list [type = com.ning.billing.catalog.api.PriceList]
-          @price_list = @price_list.to_java unless @price_list.nil?
-
-          # conversion for current_phase [type = com.ning.billing.catalog.api.PlanPhase]
-          @current_phase = @current_phase.to_java unless @current_phase.nil?
-
-          # conversion for product_category [type = com.ning.billing.catalog.api.ProductCategory]
-          @product_category = Java::com.ning.billing.catalog.api.ProductCategory.value_of("#{@product_category.to_s}") unless @product_category.nil?
-
           # conversion for last_active_product [type = com.ning.billing.catalog.api.Product]
           @last_active_product = @last_active_product.to_java unless @last_active_product.nil?
 
           # conversion for last_active_plan [type = com.ning.billing.catalog.api.Plan]
           @last_active_plan = @last_active_plan.to_java unless @last_active_plan.nil?
 
+          # conversion for last_active_phase [type = com.ning.billing.catalog.api.PlanPhase]
+          @last_active_phase = @last_active_phase.to_java unless @last_active_phase.nil?
+
           # conversion for last_active_price_list [type = com.ning.billing.catalog.api.PriceList]
           @last_active_price_list = @last_active_price_list.to_java unless @last_active_price_list.nil?
 
@@ -123,9 +111,6 @@ module Killbill
             @charged_through_date = Java::org.joda.time.LocalDate.parse(@charged_through_date.to_s)
           end
 
-          # conversion for bcd [type = int]
-          @bcd = @bcd
-
           # conversion for current_state_for_service [type = java.lang.String]
           @current_state_for_service = @current_state_for_service.to_s unless @current_state_for_service.nil?
           self
@@ -167,26 +152,6 @@ module Killbill
             @effective_end_date = @effective_end_date.to_s
           end
 
-          # conversion for product [type = com.ning.billing.catalog.api.Product]
-          @product = j_obj.product
-          @product = Killbill::Plugin::Model::Product.new.to_ruby(@product) unless @product.nil?
-
-          # conversion for plan [type = com.ning.billing.catalog.api.Plan]
-          @plan = j_obj.plan
-          @plan = Killbill::Plugin::Model::Plan.new.to_ruby(@plan) unless @plan.nil?
-
-          # conversion for price_list [type = com.ning.billing.catalog.api.PriceList]
-          @price_list = j_obj.price_list
-          @price_list = Killbill::Plugin::Model::PriceList.new.to_ruby(@price_list) unless @price_list.nil?
-
-          # conversion for current_phase [type = com.ning.billing.catalog.api.PlanPhase]
-          @current_phase = j_obj.current_phase
-          @current_phase = Killbill::Plugin::Model::PlanPhase.new.to_ruby(@current_phase) unless @current_phase.nil?
-
-          # conversion for product_category [type = com.ning.billing.catalog.api.ProductCategory]
-          @product_category = j_obj.product_category
-          @product_category = @product_category.to_s.to_sym unless @product_category.nil?
-
           # conversion for last_active_product [type = com.ning.billing.catalog.api.Product]
           @last_active_product = j_obj.last_active_product
           @last_active_product = Killbill::Plugin::Model::Product.new.to_ruby(@last_active_product) unless @last_active_product.nil?
@@ -195,6 +160,10 @@ module Killbill
           @last_active_plan = j_obj.last_active_plan
           @last_active_plan = Killbill::Plugin::Model::Plan.new.to_ruby(@last_active_plan) unless @last_active_plan.nil?
 
+          # conversion for last_active_phase [type = com.ning.billing.catalog.api.PlanPhase]
+          @last_active_phase = j_obj.last_active_phase
+          @last_active_phase = Killbill::Plugin::Model::PlanPhase.new.to_ruby(@last_active_phase) unless @last_active_phase.nil?
+
           # conversion for last_active_price_list [type = com.ning.billing.catalog.api.PriceList]
           @last_active_price_list = j_obj.last_active_price_list
           @last_active_price_list = Killbill::Plugin::Model::PriceList.new.to_ruby(@last_active_price_list) unless @last_active_price_list.nil?
@@ -241,9 +210,6 @@ module Killbill
             @charged_through_date = @charged_through_date.to_s
           end
 
-          # conversion for bcd [type = int]
-          @bcd = j_obj.bcd
-
           # conversion for current_state_for_service [type = java.lang.String]
           @current_state_for_service = j_obj.current_state_for_service
           self

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

@@ -73,8 +73,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::com.ning.billing.entitlement.api.SubscriptionBundle getSubscriptionBundleForAccountIdAndExternalKey(Java::java.util.UUID, Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
-        def get_subscription_bundle_for_account_id_and_external_key(accountId, externalKey, context)
+        java_signature 'Java::java.util.List getSubscriptionBundlesForAccountIdAndExternalKey(Java::java.util.UUID, Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
+        def get_subscription_bundles_for_account_id_and_external_key(accountId, externalKey, context)
 
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
@@ -85,7 +85,31 @@ module Killbill
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.get_subscription_bundle_for_account_id_and_external_key(accountId, externalKey, context)
+            res = @real_java_api.get_subscription_bundles_for_account_id_and_external_key(accountId, externalKey, context)
+            # conversion for res [type = java.util.List]
+            tmp = []
+            (res || []).each do |m|
+              # conversion for m [type = com.ning.billing.entitlement.api.SubscriptionBundle]
+              m = Killbill::Plugin::Model::SubscriptionBundle.new.to_ruby(m) unless m.nil?
+              tmp << m
+            end
+            res = tmp
+            return res
+          rescue Java::com.ning.billing.entitlement.api.SubscriptionApiException => e
+            raise Killbill::Plugin::Model::SubscriptionApiException.new.to_ruby(e)
+          end
+        end
+
+        java_signature 'Java::com.ning.billing.entitlement.api.SubscriptionBundle getActiveSubscriptionBundleForExternalKey(Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
+        def get_active_subscription_bundle_for_external_key(externalKey, context)
+
+          # conversion for externalKey [type = java.lang.String]
+          externalKey = externalKey.to_s unless externalKey.nil?
+
+          # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.get_active_subscription_bundle_for_external_key(externalKey, context)
             # conversion for res [type = com.ning.billing.entitlement.api.SubscriptionBundle]
             res = Killbill::Plugin::Model::SubscriptionBundle.new.to_ruby(res) unless res.nil?
             return res

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

@@ -32,7 +32,7 @@ module Killbill
 
         include com.ning.billing.entitlement.api.SubscriptionBundle
 
-        attr_accessor :id, :created_date, :updated_date, :account_id, :external_key, :subscriptions, :timeline
+        attr_accessor :id, :created_date, :updated_date, :account_id, :external_key, :original_created_date, :subscriptions, :timeline
 
         def initialize()
         end
@@ -59,6 +59,12 @@ module Killbill
           # conversion for external_key [type = java.lang.String]
           @external_key = @external_key.to_s unless @external_key.nil?
 
+          # conversion for original_created_date [type = org.joda.time.DateTime]
+          if !@original_created_date.nil?
+            @original_created_date =  (@original_created_date.kind_of? Time) ? DateTime.parse(@original_created_date.to_s) : @original_created_date
+            @original_created_date = Java::org.joda.time.DateTime.new(@original_created_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          end
+
           # conversion for subscriptions [type = java.util.List]
           tmp = java.util.ArrayList.new
           (@subscriptions || []).each do |m|
@@ -101,6 +107,14 @@ module Killbill
           # conversion for external_key [type = java.lang.String]
           @external_key = j_obj.external_key
 
+          # conversion for original_created_date [type = org.joda.time.DateTime]
+          @original_created_date = j_obj.original_created_date
+          if !@original_created_date.nil?
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time
+            str = fmt.print(@original_created_date)
+            @original_created_date = DateTime.iso8601(str)
+          end
+
           # conversion for subscriptions [type = java.util.List]
           @subscriptions = j_obj.subscriptions
           tmp = []

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

@@ -323,23 +323,21 @@ module Killbill
           end
         end
 
-        java_signature 'Java::java.util.List searchPaymentMethods(Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
-        def search_payment_methods(searchKey, context)
+        java_signature 'Java::com.ning.billing.util.entity.Pagination searchPaymentMethods(Java::java.lang.String, Java::java.lang.Long, Java::java.lang.Long, Java::com.ning.billing.util.callcontext.TenantContext)'
+        def search_payment_methods(searchKey, offset, limit, context)
 
           # conversion for searchKey [type = java.lang.String]
 
+          # conversion for offset [type = java.lang.Long]
+
+          # conversion for limit [type = java.lang.Long]
+
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = Killbill::Plugin::Model::TenantContext.new.to_ruby(context) unless context.nil?
           begin
-            res = @delegate_plugin.search_payment_methods(searchKey, context)
-            # conversion for res [type = java.util.List]
-            tmp = java.util.ArrayList.new
-            (res || []).each do |m|
-              # conversion for m [type = com.ning.billing.payment.api.PaymentMethodPlugin]
-              m = m.to_java unless m.nil?
-              tmp.add(m)
-            end
-            res = tmp
+            res = @delegate_plugin.search_payment_methods(searchKey, offset, limit, context)
+            # conversion for res [type = com.ning.billing.util.entity.Pagination]
+            res = res.to_java unless res.nil?
             return res
           rescue Exception => e
             message = "Failure in search_payment_methods: #{e}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
   prerelease:
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.4
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.4
     none: false
@@ -31,13 +31,13 @@ dependencies:
   name: tzinfo
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.37
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.37
     none: false
@@ -47,13 +47,13 @@ dependencies:
   name: jbundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.3
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.3
     none: false
@@ -63,13 +63,13 @@ dependencies:
   name: rack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.2
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.2
     none: false
@@ -79,13 +79,13 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
     none: false
@@ -95,13 +95,13 @@ dependencies:
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
     none: false
@@ -113,8 +113,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Jarfile
 - NEWS
@@ -153,6 +153,7 @@ files:
 - lib/killbill/gen/api/entitlement_api.rb
 - lib/killbill/gen/api/entitlement_api_exception.rb
 - lib/killbill/gen/api/entity.rb
+- lib/killbill/gen/api/enumerator_iterator.rb
 - lib/killbill/gen/api/illegal_plan_change.rb
 - lib/killbill/gen/api/international_price.rb
 - lib/killbill/gen/api/invalid_config_exception.rb
@@ -171,6 +172,7 @@ files:
 - lib/killbill/gen/api/mutable_account_data.rb
 - lib/killbill/gen/api/osgi_killbill.rb
 - lib/killbill/gen/api/osgi_plugin_properties.rb
+- lib/killbill/gen/api/pagination.rb
 - lib/killbill/gen/api/payment.rb
 - lib/killbill/gen/api/payment_api.rb
 - lib/killbill/gen/api/payment_api_exception.rb
@@ -192,6 +194,7 @@ files:
 - lib/killbill/gen/api/refund.rb
 - lib/killbill/gen/api/require_gen.rb
 - lib/killbill/gen/api/rolled_up_usage.rb
+- lib/killbill/gen/api/security_api_exception.rb
 - lib/killbill/gen/api/static_catalog.rb
 - lib/killbill/gen/api/subscription.rb
 - lib/killbill/gen/api/subscription_api.rb
@@ -199,10 +202,6 @@ files:
 - lib/killbill/gen/api/subscription_bundle.rb
 - lib/killbill/gen/api/subscription_bundle_timeline.rb
 - lib/killbill/gen/api/subscription_event.rb
-- lib/killbill/gen/api/subscription_status_dry_run.rb
-- lib/killbill/gen/api/subscription_transition.rb
-- lib/killbill/gen/api/subscription_user_api.rb
-- lib/killbill/gen/api/subscription_user_api_exception.rb
 - lib/killbill/gen/api/tag.rb
 - lib/killbill/gen/api/tag_api_exception.rb
 - lib/killbill/gen/api/tag_definition.rb
@@ -250,24 +249,23 @@ licenses:
 - Apache License (2.0)
 post_install_message:
 rdoc_options:
-- "--exclude"
-- "."
+- --exclude
+- .
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       segments:
       - 0
-      version: !binary |-
-        MA==
+      version: '0'
       hash: 2
   none: false
 requirements: