killbill 3.1.3 → 3.1.4

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

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      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:                         #
+#      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                             #
 #                                                                                 #
@@ -140,6 +141,24 @@ module Killbill
           end
         end
 
+        java_signature 'Java::org.killbill.billing.invoice.api.Invoice getInvoiceByPayment(Java::java.util.UUID, Java::org.killbill.billing.util.callcontext.TenantContext)'
+        def get_invoice_by_payment(paymentId, context)
+
+          # conversion for paymentId [type = java.util.UUID]
+          paymentId = java.util.UUID.fromString(paymentId.to_s) unless paymentId.nil?
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.get_invoice_by_payment(paymentId, context)
+            # conversion for res [type = org.killbill.billing.invoice.api.Invoice]
+            res = Killbill::Plugin::Model::Invoice.new.to_ruby(res) unless res.nil?
+            return res
+          rescue Java::org.killbill.billing.invoice.api.InvoiceApiException => e
+            raise Killbill::Plugin::Model::InvoiceApiException.new.to_ruby(e)
+          end
+        end
+
         java_signature 'Java::org.killbill.billing.invoice.api.Invoice getInvoiceByNumber(Java::java.lang.Integer, Java::org.killbill.billing.util.callcontext.TenantContext)'
         def get_invoice_by_number(number, context)
 

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

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      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:                         #
+#      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                             #
 #                                                                                 #

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

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      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:                         #
+#      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                             #
 #                                                                                 #

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

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      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:                         #
+#      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                             #
 #                                                                                 #

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

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      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:                         #
+#      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                             #
 #                                                                                 #

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

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      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:                         #
+#      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                             #
 #                                                                                 #
@@ -32,7 +33,7 @@ module Killbill
 
         include org.killbill.billing.osgi.api.OSGIKillbill
 
-        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, :currency_conversion_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, :currency_conversion_api, :plugin_config_service_api, :security_api
 
         def initialize()
         end
@@ -53,7 +54,7 @@ module Killbill
           # conversion for invoice_user_api [type = org.killbill.billing.invoice.api.InvoiceUserApi]
           @invoice_user_api = @invoice_user_api.to_java unless @invoice_user_api.nil?
 
-          # conversion for payment_api [type = org.killbill.billing.payment.api.PaymentApi]
+          # conversion for payment_api [type = org.killbill.billing.payment.api.DirectPaymentApi]
           @payment_api = @payment_api.to_java unless @payment_api.nil?
 
           # conversion for tenant_user_api [type = org.killbill.billing.tenant.api.TenantUserApi]
@@ -85,6 +86,9 @@ module Killbill
 
           # conversion for plugin_config_service_api [type = org.killbill.billing.osgi.api.config.PluginConfigServiceApi]
           @plugin_config_service_api = @plugin_config_service_api.to_java unless @plugin_config_service_api.nil?
+
+          # conversion for security_api [type = org.killbill.billing.security.api.SecurityApi]
+          @security_api = @security_api.to_java unless @security_api.nil?
           self
         end
 
@@ -109,9 +113,9 @@ 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 payment_api [type = org.killbill.billing.payment.api.PaymentApi]
+          # conversion for payment_api [type = org.killbill.billing.payment.api.DirectPaymentApi]
           @payment_api = j_obj.payment_api
-          @payment_api = Killbill::Plugin::Model::PaymentApi.new.to_ruby(@payment_api) unless @payment_api.nil?
+          @payment_api = Killbill::Plugin::Model::DirectPaymentApi.new.to_ruby(@payment_api) unless @payment_api.nil?
 
           # conversion for tenant_user_api [type = org.killbill.billing.tenant.api.TenantUserApi]
           @tenant_user_api = j_obj.tenant_user_api
@@ -152,6 +156,10 @@ module Killbill
           # conversion for plugin_config_service_api [type = org.killbill.billing.osgi.api.config.PluginConfigServiceApi]
           @plugin_config_service_api = j_obj.plugin_config_service_api
           @plugin_config_service_api = Killbill::Plugin::Model::PluginConfigServiceApi.new.to_ruby(@plugin_config_service_api) unless @plugin_config_service_api.nil?
+
+          # conversion for security_api [type = org.killbill.billing.security.api.SecurityApi]
+          @security_api = j_obj.security_api
+          @security_api = Killbill::Plugin::Model::SecurityApi.new.to_ruby(@security_api) unless @security_api.nil?
           self
         end
 

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

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      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:                         #
+#      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                             #
 #                                                                                 #

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

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      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:                         #
+#      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                             #
 #                                                                                 #

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

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      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:                         #
+#      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                             #
 #                                                                                 #

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

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      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:                         #
+#      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                             #
 #                                                                                 #

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

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      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:                         #
+#      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                             #
 #                                                                                 #
@@ -32,7 +33,7 @@ module Killbill
 
         include org.killbill.billing.payment.api.PaymentMethod
 
-        attr_accessor :id, :created_date, :updated_date, :account_id, :is_active, :plugin_name, :plugin_detail
+        attr_accessor :id, :created_date, :updated_date, :external_key, :account_id, :is_active, :plugin_name, :plugin_detail
 
         def initialize()
         end
@@ -53,6 +54,9 @@ module Killbill
             @updated_date = Java::org.joda.time.DateTime.new(@updated_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
           end
 
+          # conversion for external_key [type = java.lang.String]
+          @external_key = @external_key.to_s unless @external_key.nil?
+
           # conversion for account_id [type = java.util.UUID]
           @account_id = java.util.UUID.fromString(@account_id.to_s) unless @account_id.nil?
 
@@ -88,6 +92,9 @@ module Killbill
             @updated_date = DateTime.iso8601(str)
           end
 
+          # conversion for external_key [type = java.lang.String]
+          @external_key = j_obj.external_key
+
           # conversion for account_id [type = java.util.UUID]
           @account_id = j_obj.account_id
           @account_id = @account_id.nil? ? nil : @account_id.to_s

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

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      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:                         #
+#      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                             #
 #                                                                                 #
@@ -32,7 +33,7 @@ module Killbill
 
         include org.killbill.billing.payment.api.PaymentMethodPlugin
 
-        attr_accessor :kb_payment_method_id, :external_payment_method_id, :is_default_payment_method, :properties, :type, :cc_name, :cc_type, :cc_expiration_month, :cc_expiration_year, :cc_last4, :address1, :address2, :city, :state, :zip, :country
+        attr_accessor :kb_payment_method_id, :external_payment_method_id, :is_default_payment_method, :properties
 
         def initialize()
         end
@@ -55,42 +56,6 @@ module Killbill
             tmp.add(m)
           end
           @properties = tmp
-
-          # conversion for type [type = java.lang.String]
-          @type = @type.to_s unless @type.nil?
-
-          # conversion for cc_name [type = java.lang.String]
-          @cc_name = @cc_name.to_s unless @cc_name.nil?
-
-          # conversion for cc_type [type = java.lang.String]
-          @cc_type = @cc_type.to_s unless @cc_type.nil?
-
-          # conversion for cc_expiration_month [type = java.lang.String]
-          @cc_expiration_month = @cc_expiration_month.to_s unless @cc_expiration_month.nil?
-
-          # conversion for cc_expiration_year [type = java.lang.String]
-          @cc_expiration_year = @cc_expiration_year.to_s unless @cc_expiration_year.nil?
-
-          # conversion for cc_last4 [type = java.lang.String]
-          @cc_last4 = @cc_last4.to_s unless @cc_last4.nil?
-
-          # conversion for address1 [type = java.lang.String]
-          @address1 = @address1.to_s unless @address1.nil?
-
-          # conversion for address2 [type = java.lang.String]
-          @address2 = @address2.to_s unless @address2.nil?
-
-          # conversion for city [type = java.lang.String]
-          @city = @city.to_s unless @city.nil?
-
-          # conversion for state [type = java.lang.String]
-          @state = @state.to_s unless @state.nil?
-
-          # conversion for zip [type = java.lang.String]
-          @zip = @zip.to_s unless @zip.nil?
-
-          # conversion for country [type = java.lang.String]
-          @country = @country.to_s unless @country.nil?
           self
         end
 
@@ -120,42 +85,6 @@ module Killbill
             tmp << m
           end
           @properties = tmp
-
-          # conversion for type [type = java.lang.String]
-          @type = j_obj.type
-
-          # conversion for cc_name [type = java.lang.String]
-          @cc_name = j_obj.cc_name
-
-          # conversion for cc_type [type = java.lang.String]
-          @cc_type = j_obj.cc_type
-
-          # conversion for cc_expiration_month [type = java.lang.String]
-          @cc_expiration_month = j_obj.cc_expiration_month
-
-          # conversion for cc_expiration_year [type = java.lang.String]
-          @cc_expiration_year = j_obj.cc_expiration_year
-
-          # conversion for cc_last4 [type = java.lang.String]
-          @cc_last4 = j_obj.cc_last4
-
-          # conversion for address1 [type = java.lang.String]
-          @address1 = j_obj.address1
-
-          # conversion for address2 [type = java.lang.String]
-          @address2 = j_obj.address2
-
-          # conversion for city [type = java.lang.String]
-          @city = j_obj.city
-
-          # conversion for state [type = java.lang.String]
-          @state = j_obj.state
-
-          # conversion for zip [type = java.lang.String]
-          @zip = j_obj.zip
-
-          # conversion for country [type = java.lang.String]
-          @country = j_obj.country
           self
         end
 

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

@@ -0,0 +1,68 @@
+###################################################################################
+#                                                                                 #
+#                   Copyright 2010-2013 Ning, 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
+
+      java_package 'org.killbill.billing.payment.api'
+      class PaymentOptions
+
+        include org.killbill.billing.payment.api.PaymentOptions
+
+        attr_accessor :is_external_payment, :payment_control_plugin_name
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for is_external_payment [type = boolean]
+          @is_external_payment = @is_external_payment.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_external_payment)
+
+          # conversion for payment_control_plugin_name [type = java.lang.String]
+          @payment_control_plugin_name = @payment_control_plugin_name.to_s unless @payment_control_plugin_name.nil?
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for is_external_payment [type = boolean]
+          @is_external_payment = j_obj.is_external_payment
+          if @is_external_payment.nil?
+            @is_external_payment = false
+          else
+            tmp_bool = (@is_external_payment.java_kind_of? java.lang.Boolean) ? @is_external_payment.boolean_value : @is_external_payment
+            @is_external_payment = tmp_bool ? true : false
+          end
+
+          # conversion for payment_control_plugin_name [type = java.lang.String]
+          @payment_control_plugin_name = j_obj.payment_control_plugin_name
+          self
+        end
+
+      end
+    end
+  end
+end