killbill 8.3.0 → 8.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f1ccd70a55b23376aa218718b92c6039d67d2b7
-  data.tar.gz: 7bedb70d47746cfb35cb81cd6dfc26969f85b53d
+  metadata.gz: 4b24b6521c579ee81e3eaa2e9bd164a0a9c9a6a6
+  data.tar.gz: a5e1b8331da5bf78bb135c63b26bbddca008982f
 SHA512:
-  metadata.gz: b3f8588f85ac21c46f12b0f4ade6310ad3f582f58003df22ede10eb01093fcc0cd4e396e77ef5e9040c80146e1a7ac6f40772b8028c6ba0b5712c699c148c053
-  data.tar.gz: 326d4589c0ec928f646fcef67843472f002c97d51e05d89b0c1d74e02a927b4bcd4d34b7e3fec964871076db88204941054469f86550adbc1e5e8b90a078adb5
+  metadata.gz: e9a11b9a5388bf7cd1458fc6649b5a8f20dcfc383e19fcf1858edf39119aeb1468b333f23df0a2a3479e5b110a1d8d10de8ac49cdeceba40c160284917375132
+  data.tar.gz: 98d0b8417b688bb0f8e98f5b1df77a110ea4e59ff9e2f25d529ba363735742a26fa516799cc524598dd979946945ac84bbf35e7c520130d500e1bc5f77e9af48

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill (8.3.0)
+    killbill (8.3.1)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)

data/Jarfile

@@ -6,7 +6,7 @@ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.23'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.23'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.23'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.23'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.17.8'
-jar 'org.kill-bill.billing:killbill-util', '0.17.8'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.18.0'
+jar 'org.kill-bill.billing:killbill-util', '0.18.0'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/Jarfile.lock

@@ -4,22 +4,20 @@
 - joda-time:joda-time:jar:2.3
 - org.weakref:jmxutils:jar:1.18
 - commons-beanutils:commons-beanutils:jar:1.8.3
-- org.kill-bill.billing:killbill-platform-api:jar:0.34
 - com.google.inject:guice:jar:3.0
 - org.osgi:org.osgi.core:jar:5.0.0
 - com.fasterxml.jackson.core:jackson-databind:jar:2.4.5
 - org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.23
+- org.kill-bill.billing:killbill-platform-api:jar:0.36.1
 - com.samskivert:jmustache:jar:1.5
-- org.kill-bill.billing:killbill-util:jar:tests:0.17.8
 - org.kill-bill.commons:killbill-clock:jar:0.20
+- org.kill-bill.billing:killbill-util:jar:0.18.0
 - com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.5
-- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.34
 - org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.23
 - org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
 - com.h2database:h2:jar:1.4.186
 - com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.5
 - javax.activation:activation:jar:1.1
-- org.kill-bill.billing:killbill-internal-api:jar:0.17.8
 - org.javassist:javassist:jar:3.19.0-GA
 - org.skife.config:config-magic:jar:0.14
 - org.apache.commons:commons-email:jar:1.2
@@ -33,15 +31,14 @@
 - org.slf4j:jcl-over-slf4j:jar:1.7.21
 - javax.mail:mail:jar:1.4.1
 - io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
-- org.kill-bill.billing:killbill-platform-osgi:jar:0.34
 - org.jdbi:jdbi:jar:2.62
 - com.fasterxml.jackson.core:jackson-core:jar:2.4.5
 - org.apache.felix:org.apache.felix.framework:jar:4.4.1
 - org.joda:joda-money:jar:0.9
 - org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.23
-- org.kill-bill.billing:killbill-util:jar:0.17.8
 - org.apache.shiro:shiro-core:jar:1.2.3
-- org.kill-bill.billing:killbill-platform-base:jar:0.34
+- org.kill-bill.billing:killbill-internal-api:jar:0.18.0
+- org.kill-bill.billing:killbill-util:jar:tests:0.18.0
 - org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.23
 - org.kill-bill.commons:killbill-jdbi:jar:0.20
 - com.google.guava:guava:jar:r09
@@ -49,10 +46,13 @@
 - org.osgi:org.osgi.compendium:jar:5.0.0
 - org.kill-bill.commons:killbill-xmlloader:jar:0.20
 - javax.servlet:javax.servlet-api:jar:3.1.0
+- org.kill-bill.billing:killbill-platform-osgi:jar:0.36.1
+- org.kill-bill.billing:killbill-platform-base:jar:0.36.1
 - org.apache.shiro:shiro-ehcache:jar:1.2.3
 - javax.inject:javax.inject:jar:1
 - org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.23
 - org.kill-bill.billing:killbill-api:jar:0.50
+- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.36.1
 - com.google.inject.extensions:guice-multibindings:jar:3.0
 - net.sf.ehcache:ehcache:jar:2.9.1
 - org.kill-bill.commons:killbill-locker:jar:0.20

data/NEWS

@@ -1,3 +1,6 @@
+8.3.1
+    Fix outdated EntitlementPluginApi models
+
 8.3.0
     Initial release for Kill Bill 0.18.x
 

data/README.md

@@ -16,10 +16,10 @@ All plugin types can interact with Kill Bill directly via APIs and expose HTTP e
 Kill Bill compatibility
 -----------------------
 
-| OSS parent version | Kill Bill version |
-| -----------------: | ----------------: |
-| 7.x.y              | 0.16.z            |
-| 8.3.y              | 0.18.z            |
+| Framework version | Kill Bill version |
+| ----------------: | ----------------: |
+| 7.x.y             | 0.16.z            |
+| 8.x.y             | 0.18.z            |
 
 
 How to write a Notification plugin

data/generators/active_merchant/templates/Jarfile.rb

@@ -1,11 +1,12 @@
-jar 'org.kill-bill.billing:killbill-api', '0.32'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.18'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.15.10'
+jar 'org.kill-bill.billing:killbill-api', '0.50'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.23'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.18.0'
+jar 'org.kill-bill.billing:killbill-util', '0.18.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', '~> 7.0'
+  s.add_dependency 'killbill', '~> 8.0'
 
   s.add_dependency 'sinatra', '~> 1.3.4'
   s.add_dependency 'thread_safe', '~> 0.3.4'

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.entitlement.plugin.api.EntitlementContext
 
-        attr_accessor :user_token, :user_name, :call_origin, :user_type, :reason_code, :comments, :created_date, :updated_date, :tenant_id, :operation_type, :account_id, :destination_account_id, :bundle_id, :external_key, :entitlement_specifiers, :entitlement_effective_date, :billing_effective_date, :billing_action_policy, :plugin_properties
+        attr_accessor :user_token, :user_name, :call_origin, :user_type, :reason_code, :comments, :created_date, :updated_date, :tenant_id, :operation_type, :account_id, :destination_account_id, :base_entitlement_with_add_ons_specifiers, :billing_action_policy, :plugin_properties
 
         def initialize()
         end
@@ -82,30 +82,14 @@ module Killbill
           # conversion for destination_account_id [type = java.util.UUID]
           @destination_account_id = java.util.UUID.fromString(@destination_account_id.to_s) unless @destination_account_id.nil?
 
-          # conversion for bundle_id [type = java.util.UUID]
-          @bundle_id = java.util.UUID.fromString(@bundle_id.to_s) unless @bundle_id.nil?
-
-          # conversion for external_key [type = java.lang.String]
-          @external_key = @external_key.to_s unless @external_key.nil?
-
-          # conversion for entitlement_specifiers [type = java.util.List]
+          # conversion for base_entitlement_with_add_ons_specifiers [type = java.lang.Iterable]
           tmp = java.util.ArrayList.new
-          (@entitlement_specifiers || []).each do |m|
-            # conversion for m [type = org.killbill.billing.entitlement.api.EntitlementSpecifier]
+          (@base_entitlement_with_add_ons_specifiers || []).each do |m|
+            # conversion for m [type = org.killbill.billing.entitlement.api.BaseEntitlementWithAddOnsSpecifier]
             m = m.to_java unless m.nil?
             tmp.add(m)
           end
-          @entitlement_specifiers = tmp
-
-          # conversion for entitlement_effective_date [type = org.joda.time.LocalDate]
-          if !@entitlement_effective_date.nil?
-            @entitlement_effective_date = Java::org.joda.time.LocalDate.parse(@entitlement_effective_date.to_s)
-          end
-
-          # conversion for billing_effective_date [type = org.joda.time.LocalDate]
-          if !@billing_effective_date.nil?
-            @billing_effective_date = Java::org.joda.time.LocalDate.parse(@billing_effective_date.to_s)
-          end
+          @base_entitlement_with_add_ons_specifiers = tmp
 
           # conversion for billing_action_policy [type = org.killbill.billing.catalog.api.BillingActionPolicy]
           @billing_action_policy = Java::org.killbill.billing.catalog.api.BillingActionPolicy.value_of( @billing_action_policy.to_s ) unless @billing_action_policy.nil?
@@ -175,34 +159,15 @@ module Killbill
           @destination_account_id = j_obj.destination_account_id
           @destination_account_id = @destination_account_id.nil? ? nil : @destination_account_id.to_s
 
-          # conversion for bundle_id [type = java.util.UUID]
-          @bundle_id = j_obj.bundle_id
-          @bundle_id = @bundle_id.nil? ? nil : @bundle_id.to_s
-
-          # conversion for external_key [type = java.lang.String]
-          @external_key = j_obj.external_key
-
-          # conversion for entitlement_specifiers [type = java.util.List]
-          @entitlement_specifiers = j_obj.entitlement_specifiers
+          # conversion for base_entitlement_with_add_ons_specifiers [type = java.lang.Iterable]
+          @base_entitlement_with_add_ons_specifiers = j_obj.base_entitlement_with_add_ons_specifiers
           tmp = []
-          (@entitlement_specifiers || []).each do |m|
-            # conversion for m [type = org.killbill.billing.entitlement.api.EntitlementSpecifier]
-            m = Killbill::Plugin::Model::EntitlementSpecifier.new.to_ruby(m) unless m.nil?
+          (@base_entitlement_with_add_ons_specifiers.nil? ? [] : @base_entitlement_with_add_ons_specifiers.iterator).each do |m|
+            # conversion for m [type = org.killbill.billing.entitlement.api.BaseEntitlementWithAddOnsSpecifier]
+            m = Killbill::Plugin::Model::BaseEntitlementWithAddOnsSpecifier.new.to_ruby(m) unless m.nil?
             tmp << m
           end
-          @entitlement_specifiers = tmp
-
-          # conversion for entitlement_effective_date [type = org.joda.time.LocalDate]
-          @entitlement_effective_date = j_obj.entitlement_effective_date
-          if !@entitlement_effective_date.nil?
-            @entitlement_effective_date = @entitlement_effective_date.to_s
-          end
-
-          # conversion for billing_effective_date [type = org.joda.time.LocalDate]
-          @billing_effective_date = j_obj.billing_effective_date
-          if !@billing_effective_date.nil?
-            @billing_effective_date = @billing_effective_date.to_s
-          end
+          @base_entitlement_with_add_ons_specifiers = tmp
 
           # conversion for billing_action_policy [type = org.killbill.billing.catalog.api.BillingActionPolicy]
           @billing_action_policy = j_obj.billing_action_policy

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.entitlement.plugin.api.PriorEntitlementResult
 
-        attr_accessor :is_aborted, :adjusted_entitlement_effective_date, :adjusted_billing_effective_date, :adjusted_billing_action_policy, :adjusted_entitlement_specifiers, :adjusted_plugin_properties
+        attr_accessor :is_aborted, :adjusted_billing_action_policy, :adjusted_base_entitlement_with_add_ons_specifiers, :adjusted_plugin_properties
 
         def initialize()
         end
@@ -43,27 +43,17 @@ module Killbill
           # conversion for is_aborted [type = boolean]
           @is_aborted = @is_aborted.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_aborted)
 
-          # conversion for adjusted_entitlement_effective_date [type = org.joda.time.LocalDate]
-          if !@adjusted_entitlement_effective_date.nil?
-            @adjusted_entitlement_effective_date = Java::org.joda.time.LocalDate.parse(@adjusted_entitlement_effective_date.to_s)
-          end
-
-          # conversion for adjusted_billing_effective_date [type = org.joda.time.LocalDate]
-          if !@adjusted_billing_effective_date.nil?
-            @adjusted_billing_effective_date = Java::org.joda.time.LocalDate.parse(@adjusted_billing_effective_date.to_s)
-          end
-
           # conversion for adjusted_billing_action_policy [type = org.killbill.billing.catalog.api.BillingActionPolicy]
           @adjusted_billing_action_policy = Java::org.killbill.billing.catalog.api.BillingActionPolicy.value_of( @adjusted_billing_action_policy.to_s ) unless @adjusted_billing_action_policy.nil?
 
-          # conversion for adjusted_entitlement_specifiers [type = java.util.List]
+          # conversion for adjusted_base_entitlement_with_add_ons_specifiers [type = java.lang.Iterable]
           tmp = java.util.ArrayList.new
-          (@adjusted_entitlement_specifiers || []).each do |m|
-            # conversion for m [type = org.killbill.billing.entitlement.api.EntitlementSpecifier]
+          (@adjusted_base_entitlement_with_add_ons_specifiers || []).each do |m|
+            # conversion for m [type = org.killbill.billing.entitlement.api.BaseEntitlementWithAddOnsSpecifier]
             m = m.to_java unless m.nil?
             tmp.add(m)
           end
-          @adjusted_entitlement_specifiers = tmp
+          @adjusted_base_entitlement_with_add_ons_specifiers = tmp
 
           # conversion for adjusted_plugin_properties [type = java.lang.Iterable]
           tmp = java.util.ArrayList.new
@@ -86,31 +76,19 @@ module Killbill
             @is_aborted = tmp_bool ? true : false
           end
 
-          # conversion for adjusted_entitlement_effective_date [type = org.joda.time.LocalDate]
-          @adjusted_entitlement_effective_date = j_obj.adjusted_entitlement_effective_date
-          if !@adjusted_entitlement_effective_date.nil?
-            @adjusted_entitlement_effective_date = @adjusted_entitlement_effective_date.to_s
-          end
-
-          # conversion for adjusted_billing_effective_date [type = org.joda.time.LocalDate]
-          @adjusted_billing_effective_date = j_obj.adjusted_billing_effective_date
-          if !@adjusted_billing_effective_date.nil?
-            @adjusted_billing_effective_date = @adjusted_billing_effective_date.to_s
-          end
-
           # conversion for adjusted_billing_action_policy [type = org.killbill.billing.catalog.api.BillingActionPolicy]
           @adjusted_billing_action_policy = j_obj.adjusted_billing_action_policy
           @adjusted_billing_action_policy = @adjusted_billing_action_policy.to_s.to_sym unless @adjusted_billing_action_policy.nil?
 
-          # conversion for adjusted_entitlement_specifiers [type = java.util.List]
-          @adjusted_entitlement_specifiers = j_obj.adjusted_entitlement_specifiers
+          # conversion for adjusted_base_entitlement_with_add_ons_specifiers [type = java.lang.Iterable]
+          @adjusted_base_entitlement_with_add_ons_specifiers = j_obj.adjusted_base_entitlement_with_add_ons_specifiers
           tmp = []
-          (@adjusted_entitlement_specifiers || []).each do |m|
-            # conversion for m [type = org.killbill.billing.entitlement.api.EntitlementSpecifier]
-            m = Killbill::Plugin::Model::EntitlementSpecifier.new.to_ruby(m) unless m.nil?
+          (@adjusted_base_entitlement_with_add_ons_specifiers.nil? ? [] : @adjusted_base_entitlement_with_add_ons_specifiers.iterator).each do |m|
+            # conversion for m [type = org.killbill.billing.entitlement.api.BaseEntitlementWithAddOnsSpecifier]
+            m = Killbill::Plugin::Model::BaseEntitlementWithAddOnsSpecifier.new.to_ruby(m) unless m.nil?
             tmp << m
           end
-          @adjusted_entitlement_specifiers = tmp
+          @adjusted_base_entitlement_with_add_ons_specifiers = tmp
 
           # conversion for adjusted_plugin_properties [type = java.lang.Iterable]
           @adjusted_plugin_properties = j_obj.adjusted_plugin_properties

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

@@ -35,6 +35,7 @@ require 'killbill/gen/plugin-api/notification_plugin_api'
 require 'killbill/gen/plugin-api/payment_metadata'
 require 'killbill/gen/plugin-api/subscription_metadata'
 require 'killbill/gen/plugin-api/invoice_plugin_api'
+require 'killbill/gen/plugin-api/currency_plugin_api'
 require 'killbill/gen/plugin-api/control_result'
 require 'killbill/gen/plugin-api/on_failure_payment_control_result'
 require 'killbill/gen/plugin-api/on_success_payment_control_result'
@@ -45,7 +46,12 @@ require 'killbill/gen/plugin-api/prior_payment_control_result'
 require 'killbill/gen/plugin-api/catalog_plugin_api'
 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/entitlement_context'
+require 'killbill/gen/plugin-api/entitlement_plugin_api'
+require 'killbill/gen/plugin-api/entitlement_plugin_api_exception'
+require 'killbill/gen/plugin-api/on_failure_entitlement_result'
+require 'killbill/gen/plugin-api/on_success_entitlement_result'
+require 'killbill/gen/plugin-api/prior_entitlement_result'
 require 'killbill/gen/plugin-api/gateway_notification'
 require 'killbill/gen/plugin-api/hosted_payment_page_form_descriptor'
 require 'killbill/gen/plugin-api/payment_transaction_info_plugin'

data/lib/killbill/version.rb

@@ -1,3 +1,3 @@
 module Killbill
-  VERSION = '8.3.0'
+  VERSION = '8.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 8.3.0
+  version: 8.3.1
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-13 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra