RubyGems - killbill - Versions diffs - 1.2.0 → 1.3.0 - Mend

killbill 1.2.0 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

data/Jarfile +2 -2
data/VERSION +1 -1
data/lib/killbill.rb +2 -1
data/lib/killbill/gen/api/account.rb +2 -2
data/lib/killbill/gen/api/audit_user_api.rb +3 -3
data/lib/killbill/gen/api/blockable.rb +4 -4
data/lib/killbill/gen/api/blocking_api_exception.rb +1 -1
data/lib/killbill/gen/api/blocking_state.rb +5 -5
data/lib/killbill/gen/api/{junction_api.rb → entitlement_api.rb} +4 -4
data/lib/killbill/gen/api/osgi_killbill.rb +21 -21
data/lib/killbill/gen/api/require_gen.rb +10 -10
data/lib/killbill/gen/api/subscription.rb +16 -16
data/lib/killbill/gen/api/subscription_bundle.rb +4 -4
data/lib/killbill/gen/api/subscription_status_dry_run.rb +5 -5
data/lib/killbill/gen/api/subscription_transition.rb +11 -11
data/lib/killbill/gen/api/{entitlement_user_api.rb → subscription_user_api.rb} +36 -36
data/lib/killbill/gen/api/{entitlement_user_api_exception.rb → subscription_user_api_exception.rb} +2 -2
data/spec/spec_helper.rb +1 -1
metadata +6 -6

data/Jarfile CHANGED

@@ -1,5 +1,5 @@
-jar 'com.ning.billing:killbill-api', '0.3.0'
+jar 'com.ning.billing:killbill-api', '0.3.2'
 jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.2.4'
 jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.2.4'
-jar 'com.ning.billing:killbill-util:tests', '0.2.6-SNAPSHOT'
+jar 'com.ning.billing:killbill-util:tests', '0.3.4'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 1.2.0
1	+ 1.3.0

data/lib/killbill.rb CHANGED

@@ -24,8 +24,9 @@ begin
   IMPORT_KILLBILL_APIS = %w(
     com.ning.billing.account.api.AccountUserApi
     com.ning.billing.catalog.api.CatalogUserApi
-    com.ning.billing.entitlement.api.user.EntitlementUserApi
+    com.ning.billing.subscription.api.user.SubscriptionUserApi
     com.ning.billing.invoice.api.InvoicePaymentApi
+    com.ning.billing.entitlement.api.EntitlementApi
     com.ning.billing.invoice.api.InvoiceUserApi
     com.ning.billing.overdue.OverdueUserApi
     com.ning.billing.payment.api.PaymentApi

data/lib/killbill/gen/api/account.rb CHANGED

@@ -41,7 +41,7 @@ module Killbill
           # conversion for id [type = java.util.UUID]
           @id = java.util.UUID.fromString(@id.to_s) unless @id.nil?
-          # conversion for blocking_state [type = com.ning.billing.junction.api.BlockingState]
+          # conversion for blocking_state [type = com.ning.billing.entitlement.api.BlockingState]
           @blocking_state = @blocking_state.to_java unless @blocking_state.nil?
           # conversion for created_date [type = org.joda.time.DateTime]
@@ -122,7 +122,7 @@ module Killbill
           @id = j_obj.id
           @id = @id.nil? ? nil : @id.to_s
-          # conversion for blocking_state [type = com.ning.billing.junction.api.BlockingState]
+          # conversion for blocking_state [type = com.ning.billing.entitlement.api.BlockingState]
           @blocking_state = j_obj.blocking_state
           @blocking_state = Killbill::Plugin::Model::BlockingState.new.to_ruby(@blocking_state) unless @blocking_state.nil?

data/lib/killbill/gen/api/audit_user_api.rb CHANGED

@@ -70,8 +70,8 @@ module Killbill
             # conversion for res [type = com.ning.billing.util.audit.AuditLogsForBundles]
             res = Killbill::Plugin::Model::AuditLogsForBundles.new.to_ruby(res) unless res.nil?
             return res
-          rescue Java::com.ning.billing.entitlement.api.timeline.EntitlementRepairException => e
-            raise Killbill::Plugin::Model::EntitlementRepairException.new.to_ruby(e)
+          rescue Java::com.ning.billing.subscription.api.timeline.SubscriptionRepairException => e
+            raise Killbill::Plugin::Model::SubscriptionRepairException.new.to_ruby(e)
           end
         end
@@ -81,7 +81,7 @@ module Killbill
           # conversion for bundles [type = java.util.List]
           tmp = java.util.ArrayList.new
           (bundles || []).each do |m|
-            # conversion for m [type = com.ning.billing.entitlement.api.timeline.BundleTimeline]
+            # conversion for m [type = com.ning.billing.subscription.api.timeline.BundleTimeline]
             m = m.to_java unless m.nil?
             tmp.add(m)
           end

data/lib/killbill/gen/api/blockable.rb CHANGED

@@ -27,10 +27,10 @@ module Killbill
   module Plugin
     module Model
-      java_package 'com.ning.billing.junction.api'
+      java_package 'com.ning.billing.entitlement.api'
       class Blockable
-        include com.ning.billing.junction.api.Blockable
+        include com.ning.billing.entitlement.api.Blockable
         attr_accessor :id, :created_date, :updated_date, :blocking_state
@@ -53,7 +53,7 @@ module Killbill
             @updated_date = Java::org.joda.time.DateTime.new(@updated_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
           end
-          # conversion for blocking_state [type = com.ning.billing.junction.api.BlockingState]
+          # conversion for blocking_state [type = com.ning.billing.entitlement.api.BlockingState]
           @blocking_state = @blocking_state.to_java unless @blocking_state.nil?
           self
         end
@@ -79,7 +79,7 @@ module Killbill
             @updated_date = DateTime.iso8601(str)
           end
-          # conversion for blocking_state [type = com.ning.billing.junction.api.BlockingState]
+          # conversion for blocking_state [type = com.ning.billing.entitlement.api.BlockingState]
           @blocking_state = j_obj.blocking_state
           @blocking_state = Killbill::Plugin::Model::BlockingState.new.to_ruby(@blocking_state) unless @blocking_state.nil?
           self

data/lib/killbill/gen/api/blocking_api_exception.rb CHANGED

@@ -44,7 +44,7 @@ module Killbill
           # conversion for code [type = int]
           @code = @code
-          Java::com.ning.billing.junction.api.BlockingApiException.new(@message, @cause, @code)
+          Java::com.ning.billing.entitlement.api.BlockingApiException.new(@message, @cause, @code)
         end
         def to_ruby(j_obj)

data/lib/killbill/gen/api/blocking_state.rb CHANGED

@@ -27,10 +27,10 @@ module Killbill
   module Plugin
     module Model
-      java_package 'com.ning.billing.junction.api'
+      java_package 'com.ning.billing.entitlement.api'
       class BlockingState
-        include com.ning.billing.junction.api.BlockingState
+        include com.ning.billing.entitlement.api.BlockingState
         attr_accessor :id, :created_date, :updated_date, :blocked_id, :state_name, :type, :timestamp, :is_block_change, :is_block_entitlement, :is_block_billing, :description, :service
@@ -59,8 +59,8 @@ module Killbill
           # conversion for state_name [type = java.lang.String]
           @state_name = @state_name.to_s unless @state_name.nil?
-          # conversion for type [type = com.ning.billing.junction.api.Type]
-          @type = Java::com.ning.billing.junction.api.Type.value_of("#{@type.to_s}") unless @type.nil?
+          # conversion for type [type = com.ning.billing.entitlement.api.Type]
+          @type = Java::com.ning.billing.entitlement.api.Type.value_of("#{@type.to_s}") unless @type.nil?
           # conversion for timestamp [type = org.joda.time.DateTime]
           if !@timestamp.nil?
@@ -113,7 +113,7 @@ module Killbill
           # conversion for state_name [type = java.lang.String]
           @state_name = j_obj.state_name
-          # conversion for type [type = com.ning.billing.junction.api.Type]
+          # conversion for type [type = com.ning.billing.entitlement.api.Type]
           @type = j_obj.type
           @type = @type.to_s.to_sym unless @type.nil?

data/lib/killbill/gen/api/{junction_api.rb → entitlement_api.rb} RENAMED

@@ -27,10 +27,10 @@ module Killbill
   module Plugin
     module Api
-      java_package 'com.ning.billing.junction.api'
-      class JunctionApi
+      java_package 'com.ning.billing.entitlement.api'
+      class EntitlementApi
-        include com.ning.billing.junction.api.JunctionApi
+        include com.ning.billing.entitlement.api.EntitlementApi
         def initialize(real_java_api)
           @real_java_api = real_java_api
@@ -49,7 +49,7 @@ module Killbill
           # conversion for res [type = java.util.List]
           tmp = []
           (res || []).each do |m|
-            # conversion for m [type = com.ning.billing.junction.api.BlockingState]
+            # conversion for m [type = com.ning.billing.entitlement.api.BlockingState]
             m = Killbill::Plugin::Model::BlockingState.new.to_ruby(m) unless m.nil?
             tmp << m
           end

data/lib/killbill/gen/api/osgi_killbill.rb CHANGED

@@ -32,7 +32,7 @@ module Killbill
         include com.ning.billing.osgi.api.OSGIKillbill
-        attr_accessor :account_user_api, :catalog_user_api, :entitlement_timeline_api, :entitlement_transfer_api, :entitlement_user_api, :invoice_payment_api, :invoice_user_api, :overdue_user_api, :payment_api, :tenant_user_api, :usage_user_api, :audit_user_api, :custom_field_user_api, :export_user_api, :tag_user_api, :junction_api, :record_id_api, :plugin_config_service_api
+        attr_accessor :account_user_api, :catalog_user_api, :subscription_timeline_api, :subscription_transfer_api, :subscription_user_api, :invoice_payment_api, :invoice_user_api, :overdue_user_api, :payment_api, :tenant_user_api, :usage_user_api, :audit_user_api, :custom_field_user_api, :export_user_api, :tag_user_api, :entitlement_api, :record_id_api, :plugin_config_service_api
         def initialize()
         end
@@ -44,14 +44,14 @@ module Killbill
           # conversion for catalog_user_api [type = com.ning.billing.catalog.api.CatalogUserApi]
           @catalog_user_api = @catalog_user_api.to_java unless @catalog_user_api.nil?
-          # conversion for entitlement_timeline_api [type = com.ning.billing.entitlement.api.timeline.EntitlementTimelineApi]
-          @entitlement_timeline_api = @entitlement_timeline_api.to_java unless @entitlement_timeline_api.nil?
+          # conversion for subscription_timeline_api [type = com.ning.billing.subscription.api.timeline.SubscriptionTimelineApi]
+          @subscription_timeline_api = @subscription_timeline_api.to_java unless @subscription_timeline_api.nil?
-          # conversion for entitlement_transfer_api [type = com.ning.billing.entitlement.api.transfer.EntitlementTransferApi]
-          @entitlement_transfer_api = @entitlement_transfer_api.to_java unless @entitlement_transfer_api.nil?
+          # conversion for subscription_transfer_api [type = com.ning.billing.subscription.api.transfer.SubscriptionTransferApi]
+          @subscription_transfer_api = @subscription_transfer_api.to_java unless @subscription_transfer_api.nil?
-          # conversion for entitlement_user_api [type = com.ning.billing.entitlement.api.user.EntitlementUserApi]
-          @entitlement_user_api = @entitlement_user_api.to_java unless @entitlement_user_api.nil?
+          # conversion for subscription_user_api [type = com.ning.billing.subscription.api.user.SubscriptionUserApi]
+          @subscription_user_api = @subscription_user_api.to_java unless @subscription_user_api.nil?
           # conversion for invoice_payment_api [type = com.ning.billing.invoice.api.InvoicePaymentApi]
           @invoice_payment_api = @invoice_payment_api.to_java unless @invoice_payment_api.nil?
@@ -83,8 +83,8 @@ module Killbill
           # conversion for tag_user_api [type = com.ning.billing.util.api.TagUserApi]
           @tag_user_api = @tag_user_api.to_java unless @tag_user_api.nil?
-          # conversion for junction_api [type = com.ning.billing.junction.api.JunctionApi]
-          @junction_api = @junction_api.to_java unless @junction_api.nil?
+          # conversion for entitlement_api [type = com.ning.billing.entitlement.api.EntitlementApi]
+          @entitlement_api = @entitlement_api.to_java unless @entitlement_api.nil?
           # conversion for record_id_api [type = com.ning.billing.util.api.RecordIdApi]
           @record_id_api = @record_id_api.to_java unless @record_id_api.nil?
@@ -103,17 +103,17 @@ module Killbill
           @catalog_user_api = j_obj.catalog_user_api
           @catalog_user_api = Killbill::Plugin::Model::CatalogUserApi.new.to_ruby(@catalog_user_api) unless @catalog_user_api.nil?
-          # conversion for entitlement_timeline_api [type = com.ning.billing.entitlement.api.timeline.EntitlementTimelineApi]
-          @entitlement_timeline_api = j_obj.entitlement_timeline_api
-          @entitlement_timeline_api = Killbill::Plugin::Model::EntitlementTimelineApi.new.to_ruby(@entitlement_timeline_api) unless @entitlement_timeline_api.nil?
+          # conversion for subscription_timeline_api [type = com.ning.billing.subscription.api.timeline.SubscriptionTimelineApi]
+          @subscription_timeline_api = j_obj.subscription_timeline_api
+          @subscription_timeline_api = Killbill::Plugin::Model::SubscriptionTimelineApi.new.to_ruby(@subscription_timeline_api) unless @subscription_timeline_api.nil?
-          # conversion for entitlement_transfer_api [type = com.ning.billing.entitlement.api.transfer.EntitlementTransferApi]
-          @entitlement_transfer_api = j_obj.entitlement_transfer_api
-          @entitlement_transfer_api = Killbill::Plugin::Model::EntitlementTransferApi.new.to_ruby(@entitlement_transfer_api) unless @entitlement_transfer_api.nil?
+          # conversion for subscription_transfer_api [type = com.ning.billing.subscription.api.transfer.SubscriptionTransferApi]
+          @subscription_transfer_api = j_obj.subscription_transfer_api
+          @subscription_transfer_api = Killbill::Plugin::Model::SubscriptionTransferApi.new.to_ruby(@subscription_transfer_api) unless @subscription_transfer_api.nil?
-          # conversion for entitlement_user_api [type = com.ning.billing.entitlement.api.user.EntitlementUserApi]
-          @entitlement_user_api = j_obj.entitlement_user_api
-          @entitlement_user_api = Killbill::Plugin::Model::EntitlementUserApi.new.to_ruby(@entitlement_user_api) unless @entitlement_user_api.nil?
+          # conversion for subscription_user_api [type = com.ning.billing.subscription.api.user.SubscriptionUserApi]
+          @subscription_user_api = j_obj.subscription_user_api
+          @subscription_user_api = Killbill::Plugin::Model::SubscriptionUserApi.new.to_ruby(@subscription_user_api) unless @subscription_user_api.nil?
           # conversion for invoice_payment_api [type = com.ning.billing.invoice.api.InvoicePaymentApi]
           @invoice_payment_api = j_obj.invoice_payment_api
@@ -155,9 +155,9 @@ module Killbill
           @tag_user_api = j_obj.tag_user_api
           @tag_user_api = Killbill::Plugin::Model::TagUserApi.new.to_ruby(@tag_user_api) unless @tag_user_api.nil?
-          # conversion for junction_api [type = com.ning.billing.junction.api.JunctionApi]
-          @junction_api = j_obj.junction_api
-          @junction_api = Killbill::Plugin::Model::JunctionApi.new.to_ruby(@junction_api) unless @junction_api.nil?
+          # conversion for entitlement_api [type = com.ning.billing.entitlement.api.EntitlementApi]
+          @entitlement_api = j_obj.entitlement_api
+          @entitlement_api = Killbill::Plugin::Model::EntitlementApi.new.to_ruby(@entitlement_api) unless @entitlement_api.nil?
           # conversion for record_id_api [type = com.ning.billing.util.api.RecordIdApi]
           @record_id_api = j_obj.record_id_api

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

@@ -52,12 +52,10 @@ require 'killbill/gen/api/price_list_set'
 require 'killbill/gen/api/product'
 require 'killbill/gen/api/static_catalog'
 require 'killbill/gen/api/unit'
-require 'killbill/gen/api/entitlement_user_api'
-require 'killbill/gen/api/entitlement_user_api_exception'
-require 'killbill/gen/api/subscription'
-require 'killbill/gen/api/subscription_bundle'
-require 'killbill/gen/api/subscription_status_dry_run'
-require 'killbill/gen/api/subscription_transition'
+require 'killbill/gen/api/blockable'
+require 'killbill/gen/api/blocking_api_exception'
+require 'killbill/gen/api/blocking_state'
+require 'killbill/gen/api/entitlement_api'
 require 'killbill/gen/api/invoice_formatter'
 require 'killbill/gen/api/invoice_item_formatter'
 require 'killbill/gen/api/invoice'
@@ -67,10 +65,6 @@ require 'killbill/gen/api/invoice_item'
 require 'killbill/gen/api/invoice_payment'
 require 'killbill/gen/api/invoice_payment_api'
 require 'killbill/gen/api/invoice_user_api'
-require 'killbill/gen/api/blockable'
-require 'killbill/gen/api/blocking_api_exception'
-require 'killbill/gen/api/blocking_state'
-require 'killbill/gen/api/junction_api'
 require 'killbill/gen/api/plugin_config_service_api'
 require 'killbill/gen/api/osgi_killbill'
 require 'killbill/gen/api/osgi_plugin_properties'
@@ -82,6 +76,12 @@ 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/subscription'
+require 'killbill/gen/api/subscription_bundle'
+require 'killbill/gen/api/subscription_status_dry_run'
+require 'killbill/gen/api/subscription_transition'
+require 'killbill/gen/api/subscription_user_api'
+require 'killbill/gen/api/subscription_user_api_exception'
 require 'killbill/gen/api/tenant'
 require 'killbill/gen/api/tenant_api_exception'
 require 'killbill/gen/api/tenant_data'

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

@@ -27,10 +27,10 @@ module Killbill
   module Plugin
     module Model
-      java_package 'com.ning.billing.entitlement.api.user'
+      java_package 'com.ning.billing.subscription.api.user'
       class Subscription
-        include com.ning.billing.entitlement.api.user.Subscription
+        include com.ning.billing.subscription.api.user.Subscription
         attr_accessor :id, :blocking_state, :created_date, :updated_date, :bundle_id, :state, :source_type, :start_date, :end_date, :future_end_date, :current_plan, :last_active_plan, :current_price_list, :current_phase, :last_active_product_name, :last_active_price_list_name, :last_active_category_name, :last_active_billing_period, :charged_through_date, :paid_through_date, :category, :pending_transition, :previous_transition, :all_transitions
@@ -41,7 +41,7 @@ module Killbill
           # conversion for id [type = java.util.UUID]
           @id = java.util.UUID.fromString(@id.to_s) unless @id.nil?
-          # conversion for blocking_state [type = com.ning.billing.junction.api.BlockingState]
+          # conversion for blocking_state [type = com.ning.billing.entitlement.api.BlockingState]
           @blocking_state = @blocking_state.to_java unless @blocking_state.nil?
           # conversion for created_date [type = org.joda.time.DateTime]
@@ -59,11 +59,11 @@ module Killbill
           # conversion for bundle_id [type = java.util.UUID]
           @bundle_id = java.util.UUID.fromString(@bundle_id.to_s) unless @bundle_id.nil?
-          # conversion for state [type = com.ning.billing.entitlement.api.user.SubscriptionState]
-          @state = Java::com.ning.billing.entitlement.api.user.SubscriptionState.value_of("#{@state.to_s}") unless @state.nil?
+          # conversion for state [type = com.ning.billing.subscription.api.user.SubscriptionState]
+          @state = Java::com.ning.billing.subscription.api.user.SubscriptionState.value_of("#{@state.to_s}") unless @state.nil?
-          # conversion for source_type [type = com.ning.billing.entitlement.api.user.SubscriptionSourceType]
-          @source_type = Java::com.ning.billing.entitlement.api.user.SubscriptionSourceType.value_of("#{@source_type.to_s}") unless @source_type.nil?
+          # conversion for source_type [type = com.ning.billing.subscription.api.user.SubscriptionSourceType]
+          @source_type = Java::com.ning.billing.subscription.api.user.SubscriptionSourceType.value_of("#{@source_type.to_s}") unless @source_type.nil?
           # conversion for start_date [type = org.joda.time.DateTime]
           if !@start_date.nil?
@@ -122,16 +122,16 @@ module Killbill
           # conversion for category [type = com.ning.billing.catalog.api.ProductCategory]
           @category = Java::com.ning.billing.catalog.api.ProductCategory.value_of("#{@category.to_s}") unless @category.nil?
-          # conversion for pending_transition [type = com.ning.billing.entitlement.api.user.SubscriptionTransition]
+          # conversion for pending_transition [type = com.ning.billing.subscription.api.user.SubscriptionTransition]
           @pending_transition = @pending_transition.to_java unless @pending_transition.nil?
-          # conversion for previous_transition [type = com.ning.billing.entitlement.api.user.SubscriptionTransition]
+          # conversion for previous_transition [type = com.ning.billing.subscription.api.user.SubscriptionTransition]
           @previous_transition = @previous_transition.to_java unless @previous_transition.nil?
           # conversion for all_transitions [type = java.util.List]
           tmp = java.util.ArrayList.new
           (@all_transitions || []).each do |m|
-            # conversion for m [type = com.ning.billing.entitlement.api.user.SubscriptionTransition]
+            # conversion for m [type = com.ning.billing.subscription.api.user.SubscriptionTransition]
             m = m.to_java unless m.nil?
             tmp.add(m)
           end
@@ -144,7 +144,7 @@ module Killbill
           @id = j_obj.id
           @id = @id.nil? ? nil : @id.to_s
-          # conversion for blocking_state [type = com.ning.billing.junction.api.BlockingState]
+          # conversion for blocking_state [type = com.ning.billing.entitlement.api.BlockingState]
           @blocking_state = j_obj.blocking_state
           @blocking_state = Killbill::Plugin::Model::BlockingState.new.to_ruby(@blocking_state) unless @blocking_state.nil?
@@ -168,11 +168,11 @@ module Killbill
           @bundle_id = j_obj.bundle_id
           @bundle_id = @bundle_id.nil? ? nil : @bundle_id.to_s
-          # conversion for state [type = com.ning.billing.entitlement.api.user.SubscriptionState]
+          # conversion for state [type = com.ning.billing.subscription.api.user.SubscriptionState]
           @state = j_obj.state
           @state = @state.to_s.to_sym unless @state.nil?
-          # conversion for source_type [type = com.ning.billing.entitlement.api.user.SubscriptionSourceType]
+          # conversion for source_type [type = com.ning.billing.subscription.api.user.SubscriptionSourceType]
           @source_type = j_obj.source_type
           @source_type = @source_type.to_s.to_sym unless @source_type.nil?
@@ -248,11 +248,11 @@ module Killbill
           @category = j_obj.category
           @category = @category.to_s.to_sym unless @category.nil?
-          # conversion for pending_transition [type = com.ning.billing.entitlement.api.user.SubscriptionTransition]
+          # conversion for pending_transition [type = com.ning.billing.subscription.api.user.SubscriptionTransition]
           @pending_transition = j_obj.pending_transition
           @pending_transition = Killbill::Plugin::Model::SubscriptionTransition.new.to_ruby(@pending_transition) unless @pending_transition.nil?
-          # conversion for previous_transition [type = com.ning.billing.entitlement.api.user.SubscriptionTransition]
+          # conversion for previous_transition [type = com.ning.billing.subscription.api.user.SubscriptionTransition]
           @previous_transition = j_obj.previous_transition
           @previous_transition = Killbill::Plugin::Model::SubscriptionTransition.new.to_ruby(@previous_transition) unless @previous_transition.nil?
@@ -260,7 +260,7 @@ module Killbill
           @all_transitions = j_obj.all_transitions
           tmp = []
           (@all_transitions || []).each do |m|
-            # conversion for m [type = com.ning.billing.entitlement.api.user.SubscriptionTransition]
+            # conversion for m [type = com.ning.billing.subscription.api.user.SubscriptionTransition]
             m = Killbill::Plugin::Model::SubscriptionTransition.new.to_ruby(m) unless m.nil?
             tmp << m
           end

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

@@ -27,10 +27,10 @@ module Killbill
   module Plugin
     module Model
-      java_package 'com.ning.billing.entitlement.api.user'
+      java_package 'com.ning.billing.subscription.api.user'
       class SubscriptionBundle
-        include com.ning.billing.entitlement.api.user.SubscriptionBundle
+        include com.ning.billing.subscription.api.user.SubscriptionBundle
         attr_accessor :id, :created_date, :updated_date, :blocking_state, :account_id, :external_key, :overdue_state
@@ -53,7 +53,7 @@ module Killbill
             @updated_date = Java::org.joda.time.DateTime.new(@updated_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
           end
-          # conversion for blocking_state [type = com.ning.billing.junction.api.BlockingState]
+          # conversion for blocking_state [type = com.ning.billing.entitlement.api.BlockingState]
           @blocking_state = @blocking_state.to_java unless @blocking_state.nil?
           # conversion for account_id [type = java.util.UUID]
@@ -88,7 +88,7 @@ module Killbill
             @updated_date = DateTime.iso8601(str)
           end
-          # conversion for blocking_state [type = com.ning.billing.junction.api.BlockingState]
+          # conversion for blocking_state [type = com.ning.billing.entitlement.api.BlockingState]
           @blocking_state = j_obj.blocking_state
           @blocking_state = Killbill::Plugin::Model::BlockingState.new.to_ruby(@blocking_state) unless @blocking_state.nil?

data/lib/killbill/gen/api/subscription_status_dry_run.rb CHANGED

@@ -27,10 +27,10 @@ module Killbill
   module Plugin
     module Model
-      java_package 'com.ning.billing.entitlement.api.user'
+      java_package 'com.ning.billing.subscription.api.user'
       class SubscriptionStatusDryRun
-        include com.ning.billing.entitlement.api.user.SubscriptionStatusDryRun
+        include com.ning.billing.subscription.api.user.SubscriptionStatusDryRun
         attr_accessor :id, :product_name, :billing_period, :price_list, :phase_type, :reason
@@ -53,8 +53,8 @@ module Killbill
           # conversion for phase_type [type = com.ning.billing.catalog.api.PhaseType]
           @phase_type = Java::com.ning.billing.catalog.api.PhaseType.value_of("#{@phase_type.to_s}") unless @phase_type.nil?
-          # conversion for reason [type = com.ning.billing.entitlement.api.user.DryRunChangeReason]
-          @reason = Java::com.ning.billing.entitlement.api.user.DryRunChangeReason.value_of("#{@reason.to_s}") unless @reason.nil?
+          # conversion for reason [type = com.ning.billing.subscription.api.user.DryRunChangeReason]
+          @reason = Java::com.ning.billing.subscription.api.user.DryRunChangeReason.value_of("#{@reason.to_s}") unless @reason.nil?
           self
         end
@@ -77,7 +77,7 @@ module Killbill
           @phase_type = j_obj.phase_type
           @phase_type = @phase_type.to_s.to_sym unless @phase_type.nil?
-          # conversion for reason [type = com.ning.billing.entitlement.api.user.DryRunChangeReason]
+          # conversion for reason [type = com.ning.billing.subscription.api.user.DryRunChangeReason]
           @reason = j_obj.reason
           @reason = @reason.to_s.to_sym unless @reason.nil?
           self

data/lib/killbill/gen/api/subscription_transition.rb CHANGED

@@ -27,10 +27,10 @@ module Killbill
   module Plugin
     module Model
-      java_package 'com.ning.billing.entitlement.api.user'
+      java_package 'com.ning.billing.subscription.api.user'
       class SubscriptionTransition
-        include com.ning.billing.entitlement.api.user.SubscriptionTransition
+        include com.ning.billing.subscription.api.user.SubscriptionTransition
         attr_accessor :subscription_id, :bundle_id, :previous_state, :next_state, :previous_event_id, :previous_event_created_date, :previous_plan, :next_plan, :previous_phase, :next_event_id, :next_event_created_date, :next_phase, :previous_price_list, :next_price_list, :requested_transition_time, :effective_transition_time, :transition_type
@@ -44,11 +44,11 @@ module Killbill
           # conversion for bundle_id [type = java.util.UUID]
           @bundle_id = java.util.UUID.fromString(@bundle_id.to_s) unless @bundle_id.nil?
-          # conversion for previous_state [type = com.ning.billing.entitlement.api.user.SubscriptionState]
-          @previous_state = Java::com.ning.billing.entitlement.api.user.SubscriptionState.value_of("#{@previous_state.to_s}") unless @previous_state.nil?
+          # conversion for previous_state [type = com.ning.billing.subscription.api.user.SubscriptionState]
+          @previous_state = Java::com.ning.billing.subscription.api.user.SubscriptionState.value_of("#{@previous_state.to_s}") unless @previous_state.nil?
-          # conversion for next_state [type = com.ning.billing.entitlement.api.user.SubscriptionState]
-          @next_state = Java::com.ning.billing.entitlement.api.user.SubscriptionState.value_of("#{@next_state.to_s}") unless @next_state.nil?
+          # conversion for next_state [type = com.ning.billing.subscription.api.user.SubscriptionState]
+          @next_state = Java::com.ning.billing.subscription.api.user.SubscriptionState.value_of("#{@next_state.to_s}") unless @next_state.nil?
           # conversion for previous_event_id [type = java.util.UUID]
           @previous_event_id = java.util.UUID.fromString(@previous_event_id.to_s) unless @previous_event_id.nil?
@@ -98,8 +98,8 @@ module Killbill
             @effective_transition_time = Java::org.joda.time.DateTime.new(@effective_transition_time.to_s, Java::org.joda.time.DateTimeZone::UTC)
           end
-          # conversion for transition_type [type = com.ning.billing.entitlement.api.SubscriptionTransitionType]
-          @transition_type = Java::com.ning.billing.entitlement.api.SubscriptionTransitionType.value_of("#{@transition_type.to_s}") unless @transition_type.nil?
+          # conversion for transition_type [type = com.ning.billing.subscription.api.SubscriptionTransitionType]
+          @transition_type = Java::com.ning.billing.subscription.api.SubscriptionTransitionType.value_of("#{@transition_type.to_s}") unless @transition_type.nil?
           self
         end
@@ -112,11 +112,11 @@ module Killbill
           @bundle_id = j_obj.bundle_id
           @bundle_id = @bundle_id.nil? ? nil : @bundle_id.to_s
-          # conversion for previous_state [type = com.ning.billing.entitlement.api.user.SubscriptionState]
+          # conversion for previous_state [type = com.ning.billing.subscription.api.user.SubscriptionState]
           @previous_state = j_obj.previous_state
           @previous_state = @previous_state.to_s.to_sym unless @previous_state.nil?
-          # conversion for next_state [type = com.ning.billing.entitlement.api.user.SubscriptionState]
+          # conversion for next_state [type = com.ning.billing.subscription.api.user.SubscriptionState]
           @next_state = j_obj.next_state
           @next_state = @next_state.to_s.to_sym unless @next_state.nil?
@@ -184,7 +184,7 @@ module Killbill
             @effective_transition_time = DateTime.iso8601(str)
           end
-          # conversion for transition_type [type = com.ning.billing.entitlement.api.SubscriptionTransitionType]
+          # conversion for transition_type [type = com.ning.billing.subscription.api.SubscriptionTransitionType]
           @transition_type = j_obj.transition_type
           @transition_type = @transition_type.to_s.to_sym unless @transition_type.nil?
           self

data/lib/killbill/gen/api/{entitlement_user_api.rb → subscription_user_api.rb} RENAMED

@@ -27,17 +27,17 @@ module Killbill
   module Plugin
     module Api
-      java_package 'com.ning.billing.entitlement.api.user'
-      class EntitlementUserApi
+      java_package 'com.ning.billing.subscription.api.user'
+      class SubscriptionUserApi
-        include com.ning.billing.entitlement.api.user.EntitlementUserApi
+        include com.ning.billing.subscription.api.user.SubscriptionUserApi
         def initialize(real_java_api)
           @real_java_api = real_java_api
         end
-        java_signature 'Java::com.ning.billing.entitlement.api.user.SubscriptionBundle getBundleFromId(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
+        java_signature 'Java::com.ning.billing.subscription.api.user.SubscriptionBundle getBundleFromId(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_bundle_from_id(id, context)
           # conversion for id [type = java.util.UUID]
@@ -47,15 +47,15 @@ module Killbill
           context = context.to_java unless context.nil?
           begin
             res = @real_java_api.get_bundle_from_id(id, context)
-            # conversion for res [type = com.ning.billing.entitlement.api.user.SubscriptionBundle]
+            # conversion for res [type = com.ning.billing.subscription.api.user.SubscriptionBundle]
             res = Killbill::Plugin::Model::SubscriptionBundle.new.to_ruby(res) unless res.nil?
             return res
-          rescue Java::com.ning.billing.entitlement.api.user.EntitlementUserApiException => e
-            raise Killbill::Plugin::Model::EntitlementUserApiException.new.to_ruby(e)
+          rescue Java::com.ning.billing.subscription.api.user.SubscriptionUserApiException => e
+            raise Killbill::Plugin::Model::SubscriptionUserApiException.new.to_ruby(e)
           end
         end
-        java_signature 'Java::com.ning.billing.entitlement.api.user.Subscription getSubscriptionFromId(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
+        java_signature 'Java::com.ning.billing.subscription.api.user.Subscription getSubscriptionFromId(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_subscription_from_id(id, context)
           # conversion for id [type = java.util.UUID]
@@ -65,11 +65,11 @@ module Killbill
           context = context.to_java unless context.nil?
           begin
             res = @real_java_api.get_subscription_from_id(id, context)
-            # conversion for res [type = com.ning.billing.entitlement.api.user.Subscription]
+            # conversion for res [type = com.ning.billing.subscription.api.user.Subscription]
             res = Killbill::Plugin::Model::Subscription.new.to_ruby(res) unless res.nil?
             return res
-          rescue Java::com.ning.billing.entitlement.api.user.EntitlementUserApiException => e
-            raise Killbill::Plugin::Model::EntitlementUserApiException.new.to_ruby(e)
+          rescue Java::com.ning.billing.subscription.api.user.SubscriptionUserApiException => e
+            raise Killbill::Plugin::Model::SubscriptionUserApiException.new.to_ruby(e)
           end
         end
@@ -86,18 +86,18 @@ module Killbill
             # conversion for res [type = java.util.List]
             tmp = []
             (res || []).each do |m|
-              # conversion for m [type = com.ning.billing.entitlement.api.user.SubscriptionBundle]
+              # conversion for m [type = com.ning.billing.subscription.api.user.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.user.EntitlementUserApiException => e
-            raise Killbill::Plugin::Model::EntitlementUserApiException.new.to_ruby(e)
+          rescue Java::com.ning.billing.subscription.api.user.SubscriptionUserApiException => e
+            raise Killbill::Plugin::Model::SubscriptionUserApiException.new.to_ruby(e)
           end
         end
-        java_signature 'Java::com.ning.billing.entitlement.api.user.SubscriptionBundle getBundleForAccountAndKey(Java::java.util.UUID, Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
+        java_signature 'Java::com.ning.billing.subscription.api.user.SubscriptionBundle getBundleForAccountAndKey(Java::java.util.UUID, Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_bundle_for_account_and_key(accountId, bundleKey, context)
           # conversion for accountId [type = java.util.UUID]
@@ -110,11 +110,11 @@ module Killbill
           context = context.to_java unless context.nil?
           begin
             res = @real_java_api.get_bundle_for_account_and_key(accountId, bundleKey, context)
-            # conversion for res [type = com.ning.billing.entitlement.api.user.SubscriptionBundle]
+            # conversion for res [type = com.ning.billing.subscription.api.user.SubscriptionBundle]
             res = Killbill::Plugin::Model::SubscriptionBundle.new.to_ruby(res) unless res.nil?
             return res
-          rescue Java::com.ning.billing.entitlement.api.user.EntitlementUserApiException => e
-            raise Killbill::Plugin::Model::EntitlementUserApiException.new.to_ruby(e)
+          rescue Java::com.ning.billing.subscription.api.user.SubscriptionUserApiException => e
+            raise Killbill::Plugin::Model::SubscriptionUserApiException.new.to_ruby(e)
           end
         end
@@ -130,7 +130,7 @@ module Killbill
           # conversion for res [type = java.util.List]
           tmp = []
           (res || []).each do |m|
-            # conversion for m [type = com.ning.billing.entitlement.api.user.SubscriptionBundle]
+            # conversion for m [type = com.ning.billing.subscription.api.user.SubscriptionBundle]
             m = Killbill::Plugin::Model::SubscriptionBundle.new.to_ruby(m) unless m.nil?
             tmp << m
           end
@@ -150,7 +150,7 @@ module Killbill
           # conversion for res [type = java.util.List]
           tmp = []
           (res || []).each do |m|
-            # conversion for m [type = com.ning.billing.entitlement.api.user.Subscription]
+            # conversion for m [type = com.ning.billing.subscription.api.user.Subscription]
             m = Killbill::Plugin::Model::Subscription.new.to_ruby(m) unless m.nil?
             tmp << m
           end
@@ -173,7 +173,7 @@ module Killbill
           # conversion for res [type = java.util.List]
           tmp = []
           (res || []).each do |m|
-            # conversion for m [type = com.ning.billing.entitlement.api.user.Subscription]
+            # conversion for m [type = com.ning.billing.subscription.api.user.Subscription]
             m = Killbill::Plugin::Model::Subscription.new.to_ruby(m) unless m.nil?
             tmp << m
           end
@@ -181,7 +181,7 @@ module Killbill
           return res
         end
-        java_signature 'Java::com.ning.billing.entitlement.api.user.Subscription getBaseSubscription(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
+        java_signature 'Java::com.ning.billing.subscription.api.user.Subscription getBaseSubscription(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_base_subscription(bundleId, context)
           # conversion for bundleId [type = java.util.UUID]
@@ -191,15 +191,15 @@ module Killbill
           context = context.to_java unless context.nil?
           begin
             res = @real_java_api.get_base_subscription(bundleId, context)
-            # conversion for res [type = com.ning.billing.entitlement.api.user.Subscription]
+            # conversion for res [type = com.ning.billing.subscription.api.user.Subscription]
             res = Killbill::Plugin::Model::Subscription.new.to_ruby(res) unless res.nil?
             return res
-          rescue Java::com.ning.billing.entitlement.api.user.EntitlementUserApiException => e
-            raise Killbill::Plugin::Model::EntitlementUserApiException.new.to_ruby(e)
+          rescue Java::com.ning.billing.subscription.api.user.SubscriptionUserApiException => e
+            raise Killbill::Plugin::Model::SubscriptionUserApiException.new.to_ruby(e)
           end
         end
-        java_signature 'Java::com.ning.billing.entitlement.api.user.SubscriptionBundle createBundleForAccount(Java::java.util.UUID, Java::java.lang.String, Java::com.ning.billing.util.callcontext.CallContext)'
+        java_signature 'Java::com.ning.billing.subscription.api.user.SubscriptionBundle createBundleForAccount(Java::java.util.UUID, Java::java.lang.String, Java::com.ning.billing.util.callcontext.CallContext)'
         def create_bundle_for_account(accountId, bundleKey, context)
           # conversion for accountId [type = java.util.UUID]
@@ -212,15 +212,15 @@ module Killbill
           context = context.to_java unless context.nil?
           begin
             res = @real_java_api.create_bundle_for_account(accountId, bundleKey, context)
-            # conversion for res [type = com.ning.billing.entitlement.api.user.SubscriptionBundle]
+            # conversion for res [type = com.ning.billing.subscription.api.user.SubscriptionBundle]
             res = Killbill::Plugin::Model::SubscriptionBundle.new.to_ruby(res) unless res.nil?
             return res
-          rescue Java::com.ning.billing.entitlement.api.user.EntitlementUserApiException => e
-            raise Killbill::Plugin::Model::EntitlementUserApiException.new.to_ruby(e)
+          rescue Java::com.ning.billing.subscription.api.user.SubscriptionUserApiException => e
+            raise Killbill::Plugin::Model::SubscriptionUserApiException.new.to_ruby(e)
           end
         end
-        java_signature 'Java::com.ning.billing.entitlement.api.user.Subscription createSubscription(Java::java.util.UUID, Java::com.ning.billing.catalog.api.PlanPhaseSpecifier, Java::org.joda.time.DateTime, Java::com.ning.billing.util.callcontext.CallContext)'
+        java_signature 'Java::com.ning.billing.subscription.api.user.Subscription createSubscription(Java::java.util.UUID, Java::com.ning.billing.catalog.api.PlanPhaseSpecifier, Java::org.joda.time.DateTime, Java::com.ning.billing.util.callcontext.CallContext)'
         def create_subscription(bundleId, spec, requestedDate, context)
           # conversion for bundleId [type = java.util.UUID]
@@ -239,11 +239,11 @@ module Killbill
           context = context.to_java unless context.nil?
           begin
             res = @real_java_api.create_subscription(bundleId, spec, requestedDate, context)
-            # conversion for res [type = com.ning.billing.entitlement.api.user.Subscription]
+            # conversion for res [type = com.ning.billing.subscription.api.user.Subscription]
             res = Killbill::Plugin::Model::Subscription.new.to_ruby(res) unless res.nil?
             return res
-          rescue Java::com.ning.billing.entitlement.api.user.EntitlementUserApiException => e
-            raise Killbill::Plugin::Model::EntitlementUserApiException.new.to_ruby(e)
+          rescue Java::com.ning.billing.subscription.api.user.SubscriptionUserApiException => e
+            raise Killbill::Plugin::Model::SubscriptionUserApiException.new.to_ruby(e)
           end
         end
@@ -269,14 +269,14 @@ module Killbill
             # conversion for res [type = java.util.List]
             tmp = []
             (res || []).each do |m|
-              # conversion for m [type = com.ning.billing.entitlement.api.user.SubscriptionStatusDryRun]
+              # conversion for m [type = com.ning.billing.subscription.api.user.SubscriptionStatusDryRun]
               m = Killbill::Plugin::Model::SubscriptionStatusDryRun.new.to_ruby(m) unless m.nil?
               tmp << m
             end
             res = tmp
             return res
-          rescue Java::com.ning.billing.entitlement.api.user.EntitlementUserApiException => e
-            raise Killbill::Plugin::Model::EntitlementUserApiException.new.to_ruby(e)
+          rescue Java::com.ning.billing.subscription.api.user.SubscriptionUserApiException => e
+            raise Killbill::Plugin::Model::SubscriptionUserApiException.new.to_ruby(e)
           end
         end

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

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

data/spec/spec_helper.rb CHANGED

@@ -16,7 +16,7 @@ require 'killbill/notification_test'
 %w(
   MockAccountUserApi
-  MockEntitlementUserApi
+  MockSubscriptionUserApi
 ).each do |api|
   begin
     java_import "com.ning.billing.mock.api.#{api}"

metadata CHANGED

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease:
-  version: 1.2.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -147,8 +147,7 @@ files:
 - lib/killbill/gen/api/custom_field_user_api.rb
 - lib/killbill/gen/api/database_export_output_stream.rb
 - lib/killbill/gen/api/duration.rb
-- lib/killbill/gen/api/entitlement_user_api.rb
-- lib/killbill/gen/api/entitlement_user_api_exception.rb
+- lib/killbill/gen/api/entitlement_api.rb
 - lib/killbill/gen/api/entity.rb
 - lib/killbill/gen/api/illegal_plan_change.rb
 - lib/killbill/gen/api/international_price.rb
@@ -162,7 +161,6 @@ files:
 - lib/killbill/gen/api/invoice_payment.rb
 - lib/killbill/gen/api/invoice_payment_api.rb
 - lib/killbill/gen/api/invoice_user_api.rb
-- lib/killbill/gen/api/junction_api.rb
 - lib/killbill/gen/api/limit.rb
 - lib/killbill/gen/api/listing.rb
 - lib/killbill/gen/api/migration_plan.rb
@@ -195,6 +193,8 @@ files:
 - lib/killbill/gen/api/subscription_bundle.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
@@ -258,9 +258,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2
       version: !binary |-
         MA==
+      hash: 2
   none: false
 requirements:
 - jar 'com.ning.billing:killbill-api'