killbill 1.4.0 → 1.5.0

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

@@ -37,24 +37,277 @@ module Killbill
         end
 
 
-        java_signature 'Java::java.util.List getBlockingHistory(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
-        def get_blocking_history(overdueableId, context)
+        java_signature 'Java::com.ning.billing.entitlement.api.Entitlement createBaseEntitlement(Java::java.util.UUID, Java::com.ning.billing.catalog.api.PlanPhaseSpecifier, Java::java.lang.String, Java::org.joda.time.LocalDate, Java::com.ning.billing.util.callcontext.CallContext)'
+        def create_base_entitlement(accountId, spec, externalKey, effectiveDate, context)
 
-          # conversion for overdueableId [type = java.util.UUID]
-          overdueableId = java.util.UUID.fromString(overdueableId.to_s) unless overdueableId.nil?
+          # conversion for accountId [type = java.util.UUID]
+          accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
+
+          # conversion for spec [type = com.ning.billing.catalog.api.PlanPhaseSpecifier]
+          spec = spec.to_java unless spec.nil?
+
+          # conversion for externalKey [type = java.lang.String]
+          externalKey = externalKey.to_s unless externalKey.nil?
+
+          # conversion for effectiveDate [type = org.joda.time.LocalDate]
+          if !effectiveDate.nil?
+            effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
+          end
+
+          # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.create_base_entitlement(accountId, spec, externalKey, effectiveDate, context)
+            # conversion for res [type = com.ning.billing.entitlement.api.Entitlement]
+            res = Killbill::Plugin::Model::Entitlement.new.to_ruby(res) unless res.nil?
+            return res
+          rescue Java::com.ning.billing.entitlement.api.EntitlementApiException => e
+            raise Killbill::Plugin::Model::EntitlementApiException.new.to_ruby(e)
+          end
+        end
+
+        java_signature 'Java::com.ning.billing.entitlement.api.Entitlement addEntitlement(Java::java.util.UUID, Java::com.ning.billing.catalog.api.PlanPhaseSpecifier, Java::org.joda.time.LocalDate, Java::com.ning.billing.util.callcontext.CallContext)'
+        def add_entitlement(bundleId, spec, effectiveDate, context)
+
+          # conversion for bundleId [type = java.util.UUID]
+          bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
+
+          # conversion for spec [type = com.ning.billing.catalog.api.PlanPhaseSpecifier]
+          spec = spec.to_java unless spec.nil?
+
+          # conversion for effectiveDate [type = org.joda.time.LocalDate]
+          if !effectiveDate.nil?
+            effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
+          end
+
+          # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.add_entitlement(bundleId, spec, effectiveDate, context)
+            # conversion for res [type = com.ning.billing.entitlement.api.Entitlement]
+            res = Killbill::Plugin::Model::Entitlement.new.to_ruby(res) unless res.nil?
+            return res
+          rescue Java::com.ning.billing.entitlement.api.EntitlementApiException => e
+            raise Killbill::Plugin::Model::EntitlementApiException.new.to_ruby(e)
+          end
+        end
+
+        java_signature 'Java::java.util.List getDryRunStatusForChange(Java::java.util.UUID, Java::java.lang.String, Java::org.joda.time.LocalDate, Java::com.ning.billing.util.callcontext.TenantContext)'
+        def get_dry_run_status_for_change(bundleId, targetProductName, effectiveDate, context)
+
+          # conversion for bundleId [type = java.util.UUID]
+          bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
+
+          # conversion for targetProductName [type = java.lang.String]
+          targetProductName = targetProductName.to_s unless targetProductName.nil?
+
+          # conversion for effectiveDate [type = org.joda.time.LocalDate]
+          if !effectiveDate.nil?
+            effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
+          end
+
+          # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.get_dry_run_status_for_change(bundleId, targetProductName, effectiveDate, context)
+            # conversion for res [type = java.util.List]
+            tmp = []
+            (res || []).each do |m|
+              # conversion for m [type = com.ning.billing.entitlement.api.EntitlementAOStatusDryRun]
+              m = Killbill::Plugin::Model::EntitlementAOStatusDryRun.new.to_ruby(m) unless m.nil?
+              tmp << m
+            end
+            res = tmp
+            return res
+          rescue Java::com.ning.billing.entitlement.api.EntitlementApiException => e
+            raise Killbill::Plugin::Model::EntitlementApiException.new.to_ruby(e)
+          end
+        end
+
+        java_signature 'Java::void pause(Java::java.util.UUID, Java::org.joda.time.LocalDate, Java::com.ning.billing.util.callcontext.CallContext)'
+        def pause(bundleId, effectiveDate, context)
+
+          # conversion for bundleId [type = java.util.UUID]
+          bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
+
+          # conversion for effectiveDate [type = org.joda.time.LocalDate]
+          if !effectiveDate.nil?
+            effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
+          end
+
+          # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          @real_java_api.pause(bundleId, effectiveDate, context)
+        end
+
+        java_signature 'Java::void resume(Java::java.util.UUID, Java::org.joda.time.LocalDate, Java::com.ning.billing.util.callcontext.CallContext)'
+        def resume(bundleId, effectiveDate, context)
+
+          # conversion for bundleId [type = java.util.UUID]
+          bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
+
+          # conversion for effectiveDate [type = org.joda.time.LocalDate]
+          if !effectiveDate.nil?
+            effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
+          end
+
+          # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          @real_java_api.resume(bundleId, effectiveDate, context)
+        end
+
+        java_signature 'Java::com.ning.billing.entitlement.api.Entitlement getEntitlementForId(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
+        def get_entitlement_for_id(id, context)
+
+          # conversion for id [type = java.util.UUID]
+          id = java.util.UUID.fromString(id.to_s) unless id.nil?
 
           # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
-          res = @real_java_api.get_blocking_history(overdueableId, context)
-          # conversion for res [type = java.util.List]
-          tmp = []
-          (res || []).each do |m|
-            # conversion for m [type = com.ning.billing.entitlement.api.BlockingState]
-            m = Killbill::Plugin::Model::BlockingState.new.to_ruby(m) unless m.nil?
-            tmp << m
+          begin
+            res = @real_java_api.get_entitlement_for_id(id, context)
+            # conversion for res [type = com.ning.billing.entitlement.api.Entitlement]
+            res = Killbill::Plugin::Model::Entitlement.new.to_ruby(res) unless res.nil?
+            return res
+          rescue Java::com.ning.billing.entitlement.api.EntitlementApiException => e
+            raise Killbill::Plugin::Model::EntitlementApiException.new.to_ruby(e)
+          end
+        end
+
+        java_signature 'Java::java.util.List getAllEntitlementsForBundle(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
+        def get_all_entitlements_for_bundle(bundleId, context)
+
+          # conversion for bundleId [type = java.util.UUID]
+          bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
+
+          # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.get_all_entitlements_for_bundle(bundleId, context)
+            # conversion for res [type = java.util.List]
+            tmp = []
+            (res || []).each do |m|
+              # conversion for m [type = com.ning.billing.entitlement.api.Entitlement]
+              m = Killbill::Plugin::Model::Entitlement.new.to_ruby(m) unless m.nil?
+              tmp << m
+            end
+            res = tmp
+            return res
+          rescue Java::com.ning.billing.entitlement.api.EntitlementApiException => e
+            raise Killbill::Plugin::Model::EntitlementApiException.new.to_ruby(e)
+          end
+        end
+
+        java_signature 'Java::java.util.List getAllEntitlementsForAccountIdAndExternalKey(Java::java.util.UUID, Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
+        def get_all_entitlements_for_account_id_and_external_key(accountId, externalKey, context)
+
+          # conversion for accountId [type = java.util.UUID]
+          accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
+
+          # conversion for externalKey [type = java.lang.String]
+          externalKey = externalKey.to_s unless externalKey.nil?
+
+          # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.get_all_entitlements_for_account_id_and_external_key(accountId, externalKey, context)
+            # conversion for res [type = java.util.List]
+            tmp = []
+            (res || []).each do |m|
+              # conversion for m [type = com.ning.billing.entitlement.api.Entitlement]
+              m = Killbill::Plugin::Model::Entitlement.new.to_ruby(m) unless m.nil?
+              tmp << m
+            end
+            res = tmp
+            return res
+          rescue Java::com.ning.billing.entitlement.api.EntitlementApiException => e
+            raise Killbill::Plugin::Model::EntitlementApiException.new.to_ruby(e)
+          end
+        end
+
+        java_signature 'Java::java.util.List getAllEntitlementsForAccountId(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
+        def get_all_entitlements_for_account_id(accountId, context)
+
+          # conversion for accountId [type = java.util.UUID]
+          accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
+
+          # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.get_all_entitlements_for_account_id(accountId, context)
+            # conversion for res [type = java.util.List]
+            tmp = []
+            (res || []).each do |m|
+              # conversion for m [type = com.ning.billing.entitlement.api.Entitlement]
+              m = Killbill::Plugin::Model::Entitlement.new.to_ruby(m) unless m.nil?
+              tmp << m
+            end
+            res = tmp
+            return res
+          rescue Java::com.ning.billing.entitlement.api.EntitlementApiException => e
+            raise Killbill::Plugin::Model::EntitlementApiException.new.to_ruby(e)
+          end
+        end
+
+        java_signature 'Java::java.util.UUID transferEntitlements(Java::java.util.UUID, Java::java.util.UUID, Java::java.lang.String, Java::org.joda.time.LocalDate, Java::com.ning.billing.util.callcontext.CallContext)'
+        def transfer_entitlements(sourceAccountId, destAccountId, externalKey, effectiveDate, context)
+
+          # conversion for sourceAccountId [type = java.util.UUID]
+          sourceAccountId = java.util.UUID.fromString(sourceAccountId.to_s) unless sourceAccountId.nil?
+
+          # conversion for destAccountId [type = java.util.UUID]
+          destAccountId = java.util.UUID.fromString(destAccountId.to_s) unless destAccountId.nil?
+
+          # conversion for externalKey [type = java.lang.String]
+          externalKey = externalKey.to_s unless externalKey.nil?
+
+          # conversion for effectiveDate [type = org.joda.time.LocalDate]
+          if !effectiveDate.nil?
+            effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
+          end
+
+          # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.transfer_entitlements(sourceAccountId, destAccountId, externalKey, effectiveDate, context)
+            # conversion for res [type = java.util.UUID]
+            res = res.nil? ? nil : res.to_s
+            return res
+          rescue Java::com.ning.billing.entitlement.api.EntitlementApiException => e
+            raise Killbill::Plugin::Model::EntitlementApiException.new.to_ruby(e)
+          end
+        end
+
+        java_signature 'Java::java.util.UUID transferEntitlementsOverrideBillingPolicy(Java::java.util.UUID, Java::java.util.UUID, Java::java.lang.String, Java::org.joda.time.LocalDate, Java::com.ning.billing.catalog.api.BillingActionPolicy, Java::com.ning.billing.util.callcontext.CallContext)'
+        def transfer_entitlements_override_billing_policy(sourceAccountId, destAccountId, externalKey, effectiveDate, billingPolicy, context)
+
+          # conversion for sourceAccountId [type = java.util.UUID]
+          sourceAccountId = java.util.UUID.fromString(sourceAccountId.to_s) unless sourceAccountId.nil?
+
+          # conversion for destAccountId [type = java.util.UUID]
+          destAccountId = java.util.UUID.fromString(destAccountId.to_s) unless destAccountId.nil?
+
+          # conversion for externalKey [type = java.lang.String]
+          externalKey = externalKey.to_s unless externalKey.nil?
+
+          # conversion for effectiveDate [type = org.joda.time.LocalDate]
+          if !effectiveDate.nil?
+            effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
+          end
+
+          # conversion for billingPolicy [type = com.ning.billing.catalog.api.BillingActionPolicy]
+          billingPolicy = Java::com.ning.billing.catalog.api.BillingActionPolicy.value_of("#{billingPolicy.to_s}") unless billingPolicy.nil?
+
+          # conversion for context [type = com.ning.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.transfer_entitlements_override_billing_policy(sourceAccountId, destAccountId, externalKey, effectiveDate, billingPolicy, context)
+            # conversion for res [type = java.util.UUID]
+            res = res.nil? ? nil : res.to_s
+            return res
+          rescue Java::com.ning.billing.entitlement.api.EntitlementApiException => e
+            raise Killbill::Plugin::Model::EntitlementApiException.new.to_ruby(e)
           end
-          res = tmp
-          return res
         end
       end
     end

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

@@ -0,0 +1,66 @@
+###################################################################################
+#                                                                                 #
+#                   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
+
+      class EntitlementApiException
+
+
+        attr_accessor :message, :cause, :code
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for message [type = java.lang.String]
+          @message = @message.to_s unless @message.nil?
+
+          # conversion for cause [type = java.lang.Throwable]
+          @cause = @cause.to_s unless cause.nil?
+
+          # conversion for code [type = int]
+          @code = @code
+          Java::com.ning.billing.entitlement.api.EntitlementApiException.new(@message, @cause, @code)
+        end
+
+        def to_ruby(j_obj)
+          # conversion for message [type = java.lang.String]
+          @message = j_obj.message
+
+          # conversion for cause [type = java.lang.Throwable]
+          @cause = j_obj.cause
+          @cause = @cause.to_s unless @cause.nil?
+
+          # conversion for code [type = int]
+          @code = j_obj.code
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -32,7 +32,7 @@ module Killbill
 
         include com.ning.billing.osgi.api.OSGIKillbill
 
-        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
+        attr_accessor :account_user_api, :catalog_user_api, :subscription_api, :invoice_payment_api, :invoice_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,8 @@ 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 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 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 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 subscription_api [type = com.ning.billing.entitlement.api.SubscriptionApi]
+          @subscription_api = @subscription_api.to_java unless @subscription_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?
@@ -59,9 +53,6 @@ module Killbill
           # conversion for invoice_user_api [type = com.ning.billing.invoice.api.InvoiceUserApi]
           @invoice_user_api = @invoice_user_api.to_java unless @invoice_user_api.nil?
 
-          # conversion for overdue_user_api [type = com.ning.billing.overdue.OverdueUserApi]
-          @overdue_user_api = @overdue_user_api.to_java unless @overdue_user_api.nil?
-
           # conversion for payment_api [type = com.ning.billing.payment.api.PaymentApi]
           @payment_api = @payment_api.to_java unless @payment_api.nil?
 
@@ -103,17 +94,9 @@ 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 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 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 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 subscription_api [type = com.ning.billing.entitlement.api.SubscriptionApi]
+          @subscription_api = j_obj.subscription_api
+          @subscription_api = Killbill::Plugin::Model::SubscriptionApi.new.to_ruby(@subscription_api) unless @subscription_api.nil?
 
           # conversion for invoice_payment_api [type = com.ning.billing.invoice.api.InvoicePaymentApi]
           @invoice_payment_api = j_obj.invoice_payment_api
@@ -123,10 +106,6 @@ module Killbill
           @invoice_user_api = j_obj.invoice_user_api
           @invoice_user_api = Killbill::Plugin::Model::InvoiceUserApi.new.to_ruby(@invoice_user_api) unless @invoice_user_api.nil?
 
-          # conversion for overdue_user_api [type = com.ning.billing.overdue.OverdueUserApi]
-          @overdue_user_api = j_obj.overdue_user_api
-          @overdue_user_api = Killbill::Plugin::Model::OverdueUserApi.new.to_ruby(@overdue_user_api) unless @overdue_user_api.nil?
-
           # conversion for payment_api [type = com.ning.billing.payment.api.PaymentApi]
           @payment_api = j_obj.payment_api
           @payment_api = Killbill::Plugin::Model::PaymentApi.new.to_ruby(@payment_api) unless @payment_api.nil?

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

@@ -429,26 +429,6 @@ module Killbill
         end
       end
 
-      java_signature 'Java::java.util.List searchPaymentMethods(Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
-      def search_payment_methods(searchKey, context)
-
-        # conversion for searchKey [type = java.lang.String]
-        searchKey = searchKey.to_s unless searchKey.nil?
-
-        # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
-        context = context.to_java unless context.nil?
-        res = @real_java_api.search_payment_methods(searchKey, context)
-        # conversion for res [type = java.util.List]
-        tmp = []
-        (res || []).each do |m|
-          # conversion for m [type = com.ning.billing.payment.api.PaymentMethod]
-          m = Killbill::Plugin::Model::PaymentMethod.new.to_ruby(m) unless m.nil?
-          tmp << m
-        end
-        res = tmp
-        return res
-      end
-
       java_signature 'Java::void deletedPaymentMethod(Java::com.ning.billing.account.api.Account, Java::java.util.UUID, Java::boolean, Java::com.ning.billing.util.callcontext.CallContext)'
       def deleted_payment_method(account, paymentMethodId, deleteDefaultPaymentMethodWithAutoPayOff, context)