killbill 1.6.0 → 1.7.0

data/.travis.yml

@@ -2,16 +2,17 @@ language: ruby
 
 notifications:
   email:
-    - killbilling-dev@googlegroups.com
+    - kill-bill-commits@googlegroups.com
 
 rvm:
   - jruby-19mode
+  - jruby-20mode
   - jruby-head
 
 jdk:
+  - openjdk6
   - openjdk7
   - oraclejdk7
-  - openjdk6
 
 matrix:
   allow_failures:

data/Jarfile

@@ -1,5 +1,5 @@
-jar 'com.ning.billing:killbill-api', '0.6.0'
-jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.4.0'
-jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.4.0'
-jar 'com.ning.billing:killbill-util:tests', '0.6.0'
+jar 'com.ning.billing:killbill-api', '0.7.1'
+jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.5.0'
+jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.5.0'
+jar 'com.ning.billing:killbill-util:tests', '0.6.17'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/NEWS

@@ -1,8 +1,11 @@
+1.7.0
+    Update to killbill-api 0.7.1 and killbill-plugin-api 0.5.0 (pagination)
+
 1.6.0
-    New entitlement Apis + merge with serach APIs
+    New entitlement APIs + merge with search APIs
 
 1.5.0 (don't use)
-    New entitlement Apis
+    New entitlement APIs
 
 1.4.0
     Add search APIs

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.7.0

data/gen_config/api.conf

@@ -35,7 +35,8 @@ com.ning.billing.util.api,
 com.ning.billing.util.callcontext,
 com.ning.billing.util.customfield,
 com.ning.billing.util.entity,
-com.ning.billing.util.tag
+com.ning.billing.util.tag,
+com.ning.billing.security
 -x
 ExportUserApi,
 PluginConfig,

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

@@ -102,40 +102,40 @@ module Killbill
           end
         end
 
-        java_signature 'Java::java.util.List searchAccounts(Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
-        def search_accounts(searchKey, context)
+        java_signature 'Java::com.ning.billing.util.entity.Pagination searchAccounts(Java::java.lang.String, Java::java.lang.Long, Java::java.lang.Long, Java::com.ning.billing.util.callcontext.TenantContext)'
+        def search_accounts(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_accounts(searchKey, context)
-          # conversion for res [type = java.util.List]
-          tmp = []
-          (res || []).each do |m|
-            # conversion for m [type = com.ning.billing.account.api.Account]
-            m = Killbill::Plugin::Model::Account.new.to_ruby(m) unless m.nil?
-            tmp << m
-          end
-          res = tmp
+          res = @real_java_api.search_accounts(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
 
-        java_signature 'Java::java.util.List getAccounts(Java::com.ning.billing.util.callcontext.TenantContext)'
-        def get_accounts(context)
+        java_signature 'Java::com.ning.billing.util.entity.Pagination getAccounts(Java::java.lang.Long, Java::java.lang.Long, Java::com.ning.billing.util.callcontext.TenantContext)'
+        def get_accounts(offset, limit, context)
+
+          # 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.get_accounts(context)
-          # conversion for res [type = java.util.List]
-          tmp = []
-          (res || []).each do |m|
-            # conversion for m [type = com.ning.billing.account.api.Account]
-            m = Killbill::Plugin::Model::Account.new.to_ruby(m) unless m.nil?
-            tmp << m
-          end
-          res = tmp
+          res = @real_java_api.get_accounts(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/entitlement.rb

@@ -32,7 +32,7 @@ module Killbill
 
         include com.ning.billing.entitlement.api.Entitlement
 
-        attr_accessor :id, :created_date, :updated_date, :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
+        attr_accessor :id, :created_date, :updated_date, :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
 
         def initialize()
         end
@@ -81,27 +81,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?
 
@@ -166,26 +154,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?
@@ -194,6 +162,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?

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

@@ -0,0 +1,76 @@
+###################################################################################
+#                                                                                 #
+#                   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 'java.util'
+
+      include java.util.Iterator
+      class EnumeratorIterator
+
+        def initialize(delegate)
+          @buffer = []
+          # We expect an Enumerable or Enumerator
+          @delegate = delegate.is_a?(Enumerable) ? delegate.to_enum : delegate
+          _next
+        end
+
+        def has_next
+          !@next.nil?
+        end
+
+        def next
+          prev = @next
+          _next
+          prev
+        end
+
+        def remove
+          raise NotImplementedError.new
+        end
+
+        private
+
+        def _next
+          @next = @buffer.shift
+          return unless @next.nil?
+
+          @next = @delegate.next rescue nil
+          return if @next.nil?
+
+          if @next.is_a? Enumerable
+            @buffer += @next.to_a
+          else
+            @buffer << @next
+          end
+          _next
+        end
+
+      end
+    end
+  end
+end

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

@@ -57,6 +57,23 @@ module Killbill
           return res
         end
 
+        java_signature 'Java::com.ning.billing.util.entity.Pagination getInvoices(Java::java.lang.Long, Java::java.lang.Long, Java::com.ning.billing.util.callcontext.TenantContext)'
+        def get_invoices(offset, limit, context)
+
+          # 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.get_invoices(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
+
         java_signature 'Java::java.math.BigDecimal getAccountBalance(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_account_balance(accountId, context)
 

data/lib/killbill/gen/api/migration_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/pagination.rb

@@ -0,0 +1,79 @@
+###################################################################################
+#                                                                                 #
+#                   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.util.entity'
+      class Pagination
+
+        include com.ning.billing.util.entity.Pagination
+
+        attr_accessor :iterator, :current_offset, :next_offset, :max_nb_records, :total_nb_records
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for iterator [type = java.util.Iterator]
+          @iterator = Killbill::Plugin::Model::EnumeratorIterator.new(@iterator)
+
+          # conversion for current_offset [type = java.lang.Long]
+          @current_offset = @current_offset
+
+          # conversion for next_offset [type = java.lang.Long]
+          @next_offset = @next_offset
+
+          # conversion for max_nb_records [type = java.lang.Long]
+          @max_nb_records = @max_nb_records
+
+          # conversion for total_nb_records [type = java.lang.Long]
+          @total_nb_records = @total_nb_records
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for iterator [type = java.util.Iterator]
+          @iterator = j_obj.iterator
+
+          # conversion for current_offset [type = java.lang.Long]
+          @current_offset = j_obj.current_offset
+
+          # conversion for next_offset [type = java.lang.Long]
+          @next_offset = j_obj.next_offset
+
+          # conversion for max_nb_records [type = java.lang.Long]
+          @max_nb_records = j_obj.max_nb_records
+
+          # conversion for total_nb_records [type = java.lang.Long]
+          @total_nb_records = j_obj.total_nb_records
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -32,7 +32,7 @@ module Killbill
 
         include com.ning.billing.payment.api.Payment
 
-        attr_accessor :id, :created_date, :updated_date, :account_id, :invoice_id, :payment_method_id, :payment_number, :amount, :paid_amount, :effective_date, :currency, :payment_status, :attempts, :ext_first_payment_id_ref, :ext_second_payment_id_ref, :payment_info_plugin
+        attr_accessor :id, :created_date, :updated_date, :account_id, :invoice_id, :payment_method_id, :payment_number, :amount, :paid_amount, :effective_date, :currency, :payment_status, :attempts, :payment_info_plugin
 
         def initialize()
         end
@@ -100,12 +100,6 @@ module Killbill
           end
           @attempts = tmp
 
-          # conversion for ext_first_payment_id_ref [type = java.lang.String]
-          @ext_first_payment_id_ref = @ext_first_payment_id_ref.to_s unless @ext_first_payment_id_ref.nil?
-
-          # conversion for ext_second_payment_id_ref [type = java.lang.String]
-          @ext_second_payment_id_ref = @ext_second_payment_id_ref.to_s unless @ext_second_payment_id_ref.nil?
-
           # conversion for payment_info_plugin [type = com.ning.billing.payment.plugin.api.PaymentInfoPlugin]
           @payment_info_plugin = @payment_info_plugin.to_java unless @payment_info_plugin.nil?
           self
@@ -181,12 +175,6 @@ module Killbill
           end
           @attempts = tmp
 
-          # conversion for ext_first_payment_id_ref [type = java.lang.String]
-          @ext_first_payment_id_ref = j_obj.ext_first_payment_id_ref
-
-          # conversion for ext_second_payment_id_ref [type = java.lang.String]
-          @ext_second_payment_id_ref = j_obj.ext_second_payment_id_ref
-
           # conversion for payment_info_plugin [type = com.ning.billing.payment.plugin.api.PaymentInfoPlugin]
           @payment_info_plugin = j_obj.payment_info_plugin
           @payment_info_plugin = Killbill::Plugin::Model::PaymentInfoPlugin.new.to_ruby(@payment_info_plugin) unless @payment_info_plugin.nil?