killbill 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94be00ae2f3ef1ebce5ab9ff5d9f2f6adbbcf6e5
-  data.tar.gz: 93f90f2194d54a67e040d3f3a6a710b8424574c1
+  metadata.gz: d5e8f8c9cbd2c7f65533fbd0dba448f6112dc7f9
+  data.tar.gz: f13ec7b9c5023ba4d9e7008e4f26b6da420b32c7
 SHA512:
-  metadata.gz: aa9c26c98b33a69c9a2aac76d54da12cd9558fa3400c90c9fb7231c3cbbd7f49c1ffae4260ce1ac466fb3c6ad6a49115acf846648547ab50a9c3504ce2e2c343
-  data.tar.gz: eb4830cc7b9923c6ab72fbf1be91b7f6a4e8624a9d1652b580ace0699e41cb16cde47a97498e26d375fa40dd9580fd29ca4fdc8059fac86f96501423ed10019e
+  metadata.gz: a7d3046b88534a778eb763a0af1c0c7fbbe751f4965bc41b06fb1bdd8c3687e1486f9debc8e85c04176bccde1bb3663173af22fec51a4d4102b9e81c66fe3e89
+  data.tar.gz: 474f1fa4fb573267ce4aa0e734bf5f1c0608c3268aac6341e2b12668940959bb4763ad31b7460148a51733f6d667d13fffd97a80cd7c61be5dd855fa8bf1306b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill (4.2.0)
+    killbill (4.3.0)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)
@@ -131,4 +131,4 @@ DEPENDENCIES
   thread_safe (~> 0.3.4)
 
 BUNDLED WITH
-   1.10.4
+   1.10.5

data/gen_config/plugin_api.conf

@@ -5,6 +5,7 @@ file://$PATH_TO_REPO/killbill-plugin-api/notification/src/main/java, \
 file://$PATH_TO_REPO/killbill-plugin-api/invoice/src/main/java, \
 file://$PATH_TO_REPO/killbill-plugin-api/currency/src/main/java, \
 file://$PATH_TO_REPO/killbill-plugin-api/routing/src/main/java, \
+file://$PATH_TO_REPO/killbill-plugin-api/catalog/src/main/java, \
 file://$PATH_TO_REPO/killbill-api/src/main/java/ \
 -o \
 /tmp/output \
@@ -16,5 +17,6 @@ org.killbill.billing.notification.plugin.api, \
 org.killbill.billing.invoice.plugin.api \
 org.killbill.billing.currency.plugin.api \
 org.killbill.billing.routing.plugin.api \
+org.killbill.billing.catalog.plugin.api \
 -m \
 JRUBY_PLUGIN_API

data/generators/active_merchant/templates/Jarfile.rb

@@ -1,9 +1,10 @@
-jar 'org.kill-bill.billing:killbill-api', '0.17'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.10'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.10'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.10'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.10'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.10'
+jar 'org.kill-bill.billing:killbill-api', '0.18'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.11'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.11'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.11'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.11'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.11'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.11'
 jar 'org.kill-bill.billing:killbill-util:tests', '0.14.0'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/generators/active_merchant/templates/plugin.gemspec.rb

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 4.0.0'
+  s.add_dependency 'killbill', '~> 4'
 
   s.add_dependency 'sinatra', '~> 1.3.4'
   s.add_dependency 'thread_safe', '~> 0.3.4'

data/lib/killbill.rb

@@ -67,5 +67,6 @@ module Killbill
   require 'killbill/payment_control'
   require 'killbill/invoice'
   require 'killbill/currency'
+  require 'killbill/catalog'
 end
 KillBill = Killbill

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

@@ -41,13 +41,13 @@ module Killbill
 
         def to_java()
           # conversion for prices [type = org.killbill.billing.catalog.api.Price[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@prices || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Price]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @prices = tmp.toArray
+          @prices = tmp.to_java Java::org.killbill.billing.catalog.api.Price
 
           # conversion for is_zero [type = boolean]
           @is_zero = @is_zero.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_zero)

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

@@ -41,13 +41,13 @@ module Killbill
 
         def to_java()
           # conversion for initial_phases [type = org.killbill.billing.catalog.api.PlanPhase[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@initial_phases || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.PlanPhase]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @initial_phases = tmp.toArray
+          @initial_phases = tmp.to_java Java::org.killbill.billing.catalog.api.PlanPhase
 
           # conversion for product [type = org.killbill.billing.catalog.api.Product]
           @product = @product.to_java unless @product.nil?
@@ -71,13 +71,13 @@ module Killbill
           @plans_allowed_in_bundle = @plans_allowed_in_bundle
 
           # conversion for all_phases [type = org.killbill.billing.catalog.api.PlanPhase[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@all_phases || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.PlanPhase]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @all_phases = tmp.toArray
+          @all_phases = tmp.to_java Java::org.killbill.billing.catalog.api.PlanPhase
 
           # conversion for effective_date_for_existing_subscriptons [type = java.util.Date]
           if !@effective_date_for_existing_subscriptons.nil?

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

@@ -41,13 +41,13 @@ module Killbill
 
         def to_java()
           # conversion for initial_phases [type = org.killbill.billing.catalog.api.PlanPhase[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@initial_phases || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.PlanPhase]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @initial_phases = tmp.toArray
+          @initial_phases = tmp.to_java Java::org.killbill.billing.catalog.api.PlanPhase
 
           # conversion for product [type = org.killbill.billing.catalog.api.Product]
           @product = @product.to_java unless @product.nil?
@@ -71,13 +71,13 @@ module Killbill
           @plans_allowed_in_bundle = @plans_allowed_in_bundle
 
           # conversion for all_phases [type = org.killbill.billing.catalog.api.PlanPhase[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@all_phases || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.PlanPhase]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @all_phases = tmp.toArray
+          @all_phases = tmp.to_java Java::org.killbill.billing.catalog.api.PlanPhase
 
           # conversion for effective_date_for_existing_subscriptons [type = java.util.Date]
           if !@effective_date_for_existing_subscriptons.nil?

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

@@ -47,13 +47,13 @@ module Killbill
           @recurring = @recurring.to_java unless @recurring.nil?
 
           # conversion for usages [type = org.killbill.billing.catalog.api.Usage[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@usages || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Usage]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @usages = tmp.toArray
+          @usages = tmp.to_java Java::org.killbill.billing.catalog.api.Usage
 
           # conversion for name [type = java.lang.String]
           @name = @name.to_s unless @name.nil?

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

@@ -47,13 +47,13 @@ module Killbill
           @is_retired = @is_retired.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_retired)
 
           # conversion for plans [type = org.killbill.billing.catalog.api.Plan[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@plans || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Plan]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @plans = tmp.toArray
+          @plans = tmp.to_java Java::org.killbill.billing.catalog.api.Plan
           self
         end
 

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

@@ -47,22 +47,22 @@ module Killbill
           @is_retired = @is_retired.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_retired)
 
           # conversion for available [type = org.killbill.billing.catalog.api.Product[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@available || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Product]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @available = tmp.toArray
+          @available = tmp.to_java Java::org.killbill.billing.catalog.api.Product
 
           # conversion for included [type = org.killbill.billing.catalog.api.Product[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@included || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Product]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @included = tmp.toArray
+          @included = tmp.to_java Java::org.killbill.billing.catalog.api.Product
 
           # conversion for category [type = org.killbill.billing.catalog.api.ProductCategory]
           @category = Java::org.killbill.billing.catalog.api.ProductCategory.value_of( @category.to_s ) unless @category.nil?
@@ -71,13 +71,13 @@ module Killbill
           @catalog_name = @catalog_name.to_s unless @catalog_name.nil?
 
           # conversion for limits [type = org.killbill.billing.catalog.api.Limit[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@limits || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Limit]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @limits = tmp.toArray
+          @limits = tmp.to_java Java::org.killbill.billing.catalog.api.Limit
           self
         end
 

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

@@ -54,40 +54,40 @@ module Killbill
           end
 
           # conversion for current_supported_currencies [type = org.killbill.billing.catalog.api.Currency[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@current_supported_currencies || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Currency]
             m = Java::org.killbill.billing.catalog.api.Currency.value_of( m.to_s ) unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @current_supported_currencies = tmp.toArray
+          @current_supported_currencies = tmp.to_java Java::org.killbill.billing.catalog.api.Currency
 
           # conversion for current_products [type = org.killbill.billing.catalog.api.Product[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@current_products || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Product]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @current_products = tmp.toArray
+          @current_products = tmp.to_java Java::org.killbill.billing.catalog.api.Product
 
           # conversion for current_units [type = org.killbill.billing.catalog.api.Unit[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@current_units || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Unit]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @current_units = tmp.toArray
+          @current_units = tmp.to_java Java::org.killbill.billing.catalog.api.Unit
 
           # conversion for current_plans [type = org.killbill.billing.catalog.api.Plan[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@current_plans || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Plan]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @current_plans = tmp.toArray
+          @current_plans = tmp.to_java Java::org.killbill.billing.catalog.api.Plan
 
           # conversion for available_base_plan_listings [type = java.util.List]
           tmp = java.util.ArrayList.new

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

@@ -41,22 +41,22 @@ module Killbill
 
         def to_java()
           # conversion for limits [type = org.killbill.billing.catalog.api.Limit[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@limits || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Limit]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @limits = tmp.toArray
+          @limits = tmp.to_java Java::org.killbill.billing.catalog.api.Limit
 
           # conversion for tiered_blocks [type = org.killbill.billing.catalog.api.TieredBlock[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@tiered_blocks || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.TieredBlock]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @tiered_blocks = tmp.toArray
+          @tiered_blocks = tmp.to_java Java::org.killbill.billing.catalog.api.TieredBlock
 
           # conversion for fixed_price [type = org.killbill.billing.catalog.api.InternationalPrice]
           @fixed_price = @fixed_price.to_java unless @fixed_price.nil?

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

@@ -53,31 +53,31 @@ module Killbill
           @billing_period = Java::org.killbill.billing.catalog.api.BillingPeriod.value_of( @billing_period.to_s ) unless @billing_period.nil?
 
           # conversion for limits [type = org.killbill.billing.catalog.api.Limit[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@limits || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Limit]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @limits = tmp.toArray
+          @limits = tmp.to_java Java::org.killbill.billing.catalog.api.Limit
 
           # conversion for tiers [type = org.killbill.billing.catalog.api.Tier[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@tiers || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Tier]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @tiers = tmp.toArray
+          @tiers = tmp.to_java Java::org.killbill.billing.catalog.api.Tier
 
           # conversion for blocks [type = org.killbill.billing.catalog.api.Block[]]
-          tmp = java.util.ArrayList.new
+          tmp = []
           (@blocks || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Block]
             m = m.to_java unless m.nil?
-            tmp.add(m)
+            tmp << m
           end
-          @blocks = tmp.toArray
+          @blocks = tmp.to_java Java::org.killbill.billing.catalog.api.Block
 
           # conversion for fixed_price [type = org.killbill.billing.catalog.api.InternationalPrice]
           @fixed_price = @fixed_price.to_java unless @fixed_price.nil?

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

@@ -0,0 +1,51 @@
+#############################################################################################
+#                                                                                           #
+#                   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 PluginProperty
+
+
+        attr_accessor 
+
+        def initialize()
+        end
+
+        def to_java()
+        Java::org.killbill.billing.catalog.plugin.api.PluginProperty.new()
+      end
+
+      def to_ruby(j_obj)
+      self
+    end
+
+  end
+end
+end
+end

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

@@ -31,6 +31,10 @@ require 'killbill/gen/plugin-api/payment_plugin_api_exception'
 require 'killbill/gen/plugin-api/ext_bus_event'
 require 'killbill/gen/plugin-api/notification_plugin_api'
 require 'killbill/gen/plugin-api/invoice_plugin_api'
+require 'killbill/gen/plugin-api/catalog_plugin_api'
+require 'killbill/gen/plugin-api/plugin_property'
+require 'killbill/gen/plugin-api/standalone_plugin_catalog'
+require 'killbill/gen/plugin-api/versioned_plugin_catalog'
 require 'killbill/gen/plugin-api/currency_plugin_api'
 require 'killbill/gen/plugin-api/on_failure_payment_routing_result'
 require 'killbill/gen/plugin-api/on_success_payment_routing_result'

data/lib/killbill/version.rb

@@ -1,3 +1,3 @@
 module Killbill
-  VERSION = '4.2.0'
+  VERSION = '4.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -483,6 +483,7 @@ files:
 - lib/killbill/gen/plugin-api/payment_routing_context.rb
 - lib/killbill/gen/plugin-api/payment_routing_plugin_api.rb
 - lib/killbill/gen/plugin-api/payment_transaction_info_plugin.rb
+- lib/killbill/gen/plugin-api/plugin_property.rb
 - lib/killbill/gen/plugin-api/prior_payment_routing_result.rb
 - lib/killbill/gen/plugin-api/require_gen.rb
 - lib/killbill/gen/plugin-api/standalone_plugin_catalog.rb