killbill 1.3.0 → 1.4.0

data/Jarfile

@@ -1,5 +1,5 @@
-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.3.4'
+jar 'com.ning.billing:killbill-api', '0.4.0'
+jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.3.0'
+jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.3.0'
+jar 'com.ning.billing:killbill-util:tests', '0.3.6'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/NEWS

@@ -0,0 +1,2 @@
+1.4.0
+    Add search APIs

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/gen_config/api.conf

@@ -23,6 +23,9 @@ com.ning.billing.osgi.api,
 com.ning.billing.osgi.api.config,
 com.ning.billing.payment,
 com.ning.billing.payment.api,
+com.ning.billing.subscription,
+com.ning.billing.subscription.api,
+com.ning.billing.subscription.api.user,
 com.ning.billing.tenant,
 com.ning.billing.tenant.api,
 com.ning.billing.usage,

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

@@ -102,6 +102,26 @@ module Killbill
           end
         end
 
+        java_signature 'Java::java.util.List searchAccounts(Java::java.lang.String, Java::com.ning.billing.util.callcontext.TenantContext)'
+        def search_accounts(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_accounts(searchKey, context)
+          # conversion for res [type = java.util.List]
+          tmp = []
+          (res || []).each do |m|
+            # conversion for m [type = com.ning.billing.account.api.Account]
+            m = Killbill::Plugin::Model::Account.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          res = tmp
+          return res
+        end
+
         java_signature 'Java::java.util.List getAccounts(Java::com.ning.billing.util.callcontext.TenantContext)'
         def get_accounts(context)
 

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

@@ -429,6 +429,26 @@ 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)
 

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

@@ -32,12 +32,15 @@ module Killbill
 
         include com.ning.billing.payment.api.PaymentMethodPlugin
 
-        attr_accessor :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, :type, :cc_name, :cc_type, :cc_expiration_month, :cc_expiration_year, :cc_last4, :address1, :address2, :city, :state, :zip, :country
 
         def initialize()
         end
 
         def to_java()
+          # conversion for kb_payment_method_id [type = java.util.UUID]
+          @kb_payment_method_id = java.util.UUID.fromString(@kb_payment_method_id.to_s) unless @kb_payment_method_id.nil?
+
           # conversion for external_payment_method_id [type = java.lang.String]
           @external_payment_method_id = @external_payment_method_id.to_s unless @external_payment_method_id.nil?
 
@@ -92,6 +95,10 @@ module Killbill
         end
 
         def to_ruby(j_obj)
+          # conversion for kb_payment_method_id [type = java.util.UUID]
+          @kb_payment_method_id = j_obj.kb_payment_method_id
+          @kb_payment_method_id = @kb_payment_method_id.nil? ? nil : @kb_payment_method_id.to_s
+
           # conversion for external_payment_method_id [type = java.lang.String]
           @external_payment_method_id = j_obj.external_payment_method_id
 

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

@@ -323,6 +323,36 @@ 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]
+
+          # conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
+          context = Killbill::Plugin::Model::TenantContext.new.to_ruby(context) unless context.nil?
+          begin
+            res = @delegate_plugin.search_payment_methods(searchKey, context)
+            # conversion for res [type = java.util.List]
+            tmp = java.util.ArrayList.new
+            (res || []).each do |m|
+              # conversion for m [type = com.ning.billing.payment.api.PaymentMethodPlugin]
+              m = m.to_java unless m.nil?
+              tmp.add(m)
+            end
+            res = tmp
+            return res
+          rescue Exception => e
+            message = "Failure in search_payment_methods: #{e}"
+            unless e.backtrace.nil?
+              message = "#{message}\n#{e.backtrace.join("\n")}"
+            end
+            logger.warn message
+            raise Java::com.ning.billing.payment.plugin.api.PaymentPluginApiException.new("search_payment_methods failure", e.message)
+          ensure
+            @delegate_plugin.after_request
+          end
+        end
+
         java_signature 'Java::void resetPaymentMethods(Java::java.util.UUID, Java::java.util.List)'
         def reset_payment_methods(kbAccountId, paymentMethods)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease:
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.4
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.4
     none: false
@@ -31,13 +31,13 @@ dependencies:
   name: tzinfo
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.37
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.37
     none: false
@@ -47,13 +47,13 @@ dependencies:
   name: jbundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.3
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.3
     none: false
@@ -63,13 +63,13 @@ dependencies:
   name: rack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.2
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.2
     none: false
@@ -79,13 +79,13 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
     none: false
@@ -95,13 +95,13 @@ dependencies:
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
     none: false
@@ -113,10 +113,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Jarfile
+- NEWS
 - README.md
 - Rakefile
 - VERSION
@@ -242,24 +243,23 @@ licenses:
 - Apache License (2.0)
 post_install_message:
 rdoc_options:
-- "--exclude"
-- "."
+- --exclude
+- .
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       segments:
       - 0
-      version: !binary |-
-        MA==
+      version: '0'
       hash: 2
   none: false
 requirements: