killbill 5.2.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4267aac031e411928647f3f7958a91afb9bef67a
-  data.tar.gz: 9027ef5b616bd146e07386d67120b9fea7120c03
+  metadata.gz: 58e06c0d27b8a12a97a1b4086e9cd5affac28dac
+  data.tar.gz: 18d3148bbeb16564e501f608765e482280db7e2d
 SHA512:
-  metadata.gz: 5a8cc8856a04eac9d2161b6ac28d35acf0f3a6bc0e6898e19aec5f87bf9a6d02b80ab02ab5d37471eec6afe35f49f5bc99e3f39f18e2906eddb7450881db713e
-  data.tar.gz: 42c3432815d7f6f94fecd91152ae2234dd77a3e5be840c34a3eb5b46c43ba58270e71fa46d0337ecdabe2207be22ab1fb2a76460ec0205f03026df0813dbc610
+  metadata.gz: dd060629ff7bd0e98a897952c191028b17cae8d2997c8e2eb8de9ea3e712bc0fb9bf3d14754129b35168098ce0f3672a745e4f0676988e1b3c708d95558e13b5
+  data.tar.gz: 8897e434887466b72cb452937431e478a218fd7baf4f0a327c1af4b6616ef5e588b070d1c380b3ce420f1e966c3cf6498d67bfbc49404b61dc1b2bb281fac3a3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill (5.2.0)
+    killbill (6.0.0)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)
@@ -34,10 +34,6 @@ GEM
       activemodel (= 4.1.10)
       activesupport (= 4.1.10)
       arel (~> 5.0.0)
-    activerecord-bogacs (0.3.0)
-      thread_safe (~> 0.3)
-    activerecord-jdbc-adapter (1.3.16)
-      activerecord (>= 2.2)
     activesupport (4.1.10)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
@@ -48,15 +44,14 @@ GEM
     builder (3.2.2)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ethon (0.7.4)
+    ethon (0.8.0)
       ffi (>= 1.3.0)
-    ffi (1.9.9-java)
+    ffi (1.9.10)
+    ffi (1.9.10-java)
     i18n (0.7.0)
     jbundler (0.4.3)
       maven-tools (~> 0.32.1)
       ruby-maven (~> 3.0.4)
-    jdbc-mariadb (1.1.8)
-    jdbc-sqlite3 (3.8.10.1)
     json (1.8.2)
     json (1.8.2-java)
     maven-tools (0.32.5)
@@ -98,6 +93,7 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
+    sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)
     thread_safe (0.3.5-java)
@@ -116,16 +112,13 @@ DEPENDENCIES
   actionview (~> 4.1.0)
   activemerchant (~> 1.48.0)
   activerecord (~> 4.1.0)
-  activerecord-bogacs (~> 0.3)
-  activerecord-jdbc-adapter (~> 1.3)
   jbundler (~> 0.4.3)
-  jdbc-mariadb (~> 1.1.8)
-  jdbc-sqlite3 (~> 3.7)
   killbill!
   monetize (~> 1.1.0)
   money (~> 6.5.1)
   offsite_payments (~> 2.1.0)
   rake (>= 10.0.0)
   rspec (~> 2.12.0)
+  sqlite3 (~> 1.3.7)
   thor (~> 0.19.1)
   thread_safe (~> 0.3.4)

data/Jarfile

@@ -1,4 +1,4 @@
-jar 'org.kill-bill.billing:killbill-api', '0.23'
+jar 'org.kill-bill.billing:killbill-api', '0.26'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.16'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.16'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.16'

data/Jarfile.lock

@@ -1,13 +1,13 @@
-org.kill-bill.billing:killbill-api:jar:0.23
+org.kill-bill.billing:killbill-api:jar:0.26
 com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
 joda-time:joda-time:jar:2.3
-org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.15
-org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.15
-org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.15
-org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.15
-org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.15
-org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.15
-org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.15
+org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.16
+org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.16
+org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.16
+org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.16
+org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.16
+org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.16
+org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.16
 org.kill-bill.billing:killbill-util:jar:tests:0.14.0
 com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
 com.fasterxml.jackson.core:jackson-core:jar:2.4.3

data/gen_config/api.conf

@@ -39,7 +39,9 @@ org.killbill.billing.util.callcontext, \
 org.killbill.billing.util.customfield, \
 org.killbill.billing.util.entity, \
 org.killbill.billing.util.tag, \
+org.killbill.billing.util.nodes, \
 org.killbill.billing.security, \
+org.killbill.billing.security.api, \
 org.killbill.billing.currency.api \
 -x \
 ExportUserApi, \

data/generators/active_merchant/templates/Jarfile.rb

@@ -1,4 +1,4 @@
-jar 'org.kill-bill.billing:killbill-api', '0.23'
+jar 'org.kill-bill.billing:killbill-api', '0.26'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.16'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.16'
 jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.16'

data/lib/killbill.rb

@@ -35,9 +35,13 @@ begin
     org.killbill.billing.util.api.AuditUserApi
     org.killbill.billing.util.api.CustomFieldUserApi
     org.killbill.billing.util.api.TagUserApi
+    org.killbill.billing.security.api.SecurityApi
+    org.killbill.billing.osgi.api.PluginsInfoApi
+    org.killbill.billing.util.nodes.KillbillNodesApi
     javax.servlet.http.HttpServlet
   )
 
+
   begin
     IMPORT_KILLBILL_APIS.each { |api| java_import api }
   rescue NameError

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

@@ -86,6 +86,50 @@ module Killbill
           end
         end
 
+        java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement createBaseEntitlementWithAddOns(Java::java.util.UUID, Java::java.lang.String, Java::java.lang.Iterable, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def create_base_entitlement_with_add_ons(accountId, externalKey, entitlementSpecifier, effectiveDate, properties, 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 entitlementSpecifier [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (entitlementSpecifier || []).each do |m|
+            # conversion for m [type = org.killbill.billing.entitlement.api.EntitlementSpecifier]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          entitlementSpecifier = tmp
+
+          # conversion for effectiveDate [type = org.joda.time.LocalDate]
+          if !effectiveDate.nil?
+            effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
+          end
+
+          # conversion for properties [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (properties || []).each do |m|
+            # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          properties = tmp
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          begin
+            res = @real_java_api.create_base_entitlement_with_add_ons(accountId, externalKey, entitlementSpecifier, effectiveDate, properties, context)
+            # conversion for res [type = org.killbill.billing.entitlement.api.Entitlement]
+            res = Killbill::Plugin::Model::Entitlement.new.to_ruby(res) unless res.nil?
+            return res
+          rescue Java::org.killbill.billing.entitlement.api.EntitlementApiException => e
+            raise Killbill::Plugin::Model::EntitlementApiException.new.to_ruby(e)
+          end
+        end
+
         java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement addEntitlement(Java::java.util.UUID, Java::org.killbill.billing.catalog.api.PlanPhaseSpecifier, Java::java.util.List, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
         def add_entitlement(bundleId, spec, overrides, effectiveDate, properties, context)
 
@@ -212,6 +256,72 @@ module Killbill
           @real_java_api.resume(bundleId, effectiveDate, properties, context)
         end
 
+        java_signature 'Java::void setBlockingState(Java::java.util.UUID, Java::java.lang.String, Java::java.lang.String, Java::org.joda.time.LocalDate, Java::boolean, Java::boolean, Java::boolean, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def set_blocking_state(bundleId, stateName, serviceName, effectiveDate, blockBilling, blockEntitlement, blockChange, properties, context)
+
+          # conversion for bundleId [type = java.util.UUID]
+          bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
+
+          # conversion for stateName [type = java.lang.String]
+          stateName = stateName.to_s unless stateName.nil?
+
+          # conversion for serviceName [type = java.lang.String]
+          serviceName = serviceName.to_s unless serviceName.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 blockBilling [type = boolean]
+          blockBilling = blockBilling.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(blockBilling)
+
+          # conversion for blockEntitlement [type = boolean]
+          blockEntitlement = blockEntitlement.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(blockEntitlement)
+
+          # conversion for blockChange [type = boolean]
+          blockChange = blockChange.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(blockChange)
+
+          # conversion for properties [type = java.lang.Iterable]
+          tmp = java.util.ArrayList.new
+          (properties || []).each do |m|
+            # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          properties = tmp
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          @real_java_api.set_blocking_state(bundleId, stateName, serviceName, effectiveDate, blockBilling, blockEntitlement, blockChange, properties, context)
+        end
+
+        java_signature 'Java::java.lang.Iterable getBlockingStatesForServiceAndType(Java::java.util.UUID, Java::org.killbill.billing.entitlement.api.BlockingStateType, Java::java.lang.String, Java::org.killbill.billing.util.callcontext.TenantContext)'
+        def get_blocking_states_for_service_and_type(blockableId, type, serviceName, context)
+
+          # conversion for blockableId [type = java.util.UUID]
+          blockableId = java.util.UUID.fromString(blockableId.to_s) unless blockableId.nil?
+
+          # conversion for type [type = org.killbill.billing.entitlement.api.BlockingStateType]
+          type = Java::org.killbill.billing.entitlement.api.BlockingStateType.value_of( type.to_s ) unless type.nil?
+
+          # conversion for serviceName [type = java.lang.String]
+          serviceName = serviceName.to_s unless serviceName.nil?
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
+          context = context.to_java unless context.nil?
+          res = @real_java_api.get_blocking_states_for_service_and_type(blockableId, type, serviceName, context)
+          # conversion for res [type = java.lang.Iterable]
+          tmp = []
+          (res.nil? ? [] : res.iterator).each do |m|
+            # conversion for m [type = org.killbill.billing.entitlement.api.BlockingState]
+            m = Killbill::Plugin::Model::BlockingState.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          res = tmp
+          return res
+        end
+
         java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement getEntitlementForId(Java::java.util.UUID, Java::org.killbill.billing.util.callcontext.TenantContext)'
         def get_entitlement_for_id(id, context)
 

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

@@ -0,0 +1,77 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, 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.entitlement.api'
+      class EntitlementSpecifier
+
+        include org.killbill.billing.entitlement.api.EntitlementSpecifier
+
+        attr_accessor :plan_phase_specifier, :overrides
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for plan_phase_specifier [type = org.killbill.billing.catalog.api.PlanPhaseSpecifier]
+          @plan_phase_specifier = @plan_phase_specifier.to_java unless @plan_phase_specifier.nil?
+
+          # conversion for overrides [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@overrides || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.PlanPhasePriceOverride]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @overrides = tmp
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for plan_phase_specifier [type = org.killbill.billing.catalog.api.PlanPhaseSpecifier]
+          @plan_phase_specifier = j_obj.plan_phase_specifier
+          @plan_phase_specifier = Killbill::Plugin::Model::PlanPhaseSpecifier.new.to_ruby(@plan_phase_specifier) unless @plan_phase_specifier.nil?
+
+          # conversion for overrides [type = java.util.List]
+          @overrides = j_obj.overrides
+          tmp = []
+          (@overrides || []).each do |m|
+            # conversion for m [type = org.killbill.billing.catalog.api.PlanPhasePriceOverride]
+            m = Killbill::Plugin::Model::PlanPhasePriceOverride.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @overrides = tmp
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,74 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, 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 Api
+
+      java_package 'org.killbill.billing.util.nodes'
+      class KillbillNodesApi
+
+        include org.killbill.billing.util.nodes.KillbillNodesApi
+
+        def initialize(real_java_api)
+          @real_java_api = real_java_api
+        end
+
+
+        java_signature 'Java::java.lang.Iterable getNodesInfo()'
+        def get_nodes_info()
+        res = @real_java_api.get_nodes_info()
+        # conversion for res [type = java.lang.Iterable]
+        tmp = []
+        (res.nil? ? [] : res.iterator).each do |m|
+          # conversion for m [type = org.killbill.billing.util.nodes.NodeInfo]
+          m = Killbill::Plugin::Model::NodeInfo.new.to_ruby(m) unless m.nil?
+          tmp << m
+        end
+        res = tmp
+        return res
+      end
+
+      java_signature 'Java::void triggerNodeCommand(Java::org.killbill.billing.util.nodes.NodeCommand)'
+      def trigger_node_command(nodeCommand)
+
+        # conversion for nodeCommand [type = org.killbill.billing.util.nodes.NodeCommand]
+        nodeCommand = nodeCommand.to_java unless nodeCommand.nil?
+        @real_java_api.trigger_node_command(nodeCommand)
+      end
+
+      java_signature 'Java::void notifyPluginChanged(Java::org.killbill.billing.osgi.api.PluginInfo)'
+      def notify_plugin_changed(plugin)
+
+        # conversion for plugin [type = org.killbill.billing.osgi.api.PluginInfo]
+        plugin = plugin.to_java unless plugin.nil?
+        @real_java_api.notify_plugin_changed(plugin)
+      end
+    end
+  end
+end
+end

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

@@ -0,0 +1,76 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, 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.util.nodes'
+      class NodeCommand
+
+        include org.killbill.billing.util.nodes.NodeCommand
+
+        attr_accessor :is_system_command_type, :node_command_type, :node_command_metadata
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for is_system_command_type [type = boolean]
+          @is_system_command_type = @is_system_command_type.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_system_command_type)
+
+          # conversion for node_command_type [type = java.lang.String]
+          @node_command_type = @node_command_type.to_s unless @node_command_type.nil?
+
+          # conversion for node_command_metadata [type = org.killbill.billing.util.nodes.NodeCommandMetadata]
+          @node_command_metadata = @node_command_metadata.to_java unless @node_command_metadata.nil?
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for is_system_command_type [type = boolean]
+          @is_system_command_type = j_obj.is_system_command_type
+          if @is_system_command_type.nil?
+            @is_system_command_type = false
+          else
+            tmp_bool = (@is_system_command_type.java_kind_of? java.lang.Boolean) ? @is_system_command_type.boolean_value : @is_system_command_type
+            @is_system_command_type = tmp_bool ? true : false
+          end
+
+          # conversion for node_command_type [type = java.lang.String]
+          @node_command_type = j_obj.node_command_type
+
+          # conversion for node_command_metadata [type = org.killbill.billing.util.nodes.NodeCommandMetadata]
+          @node_command_metadata = j_obj.node_command_metadata
+          @node_command_metadata = Killbill::Plugin::Model::NodeCommandMetadata.new.to_ruby(@node_command_metadata) unless @node_command_metadata.nil?
+          self
+        end
+
+      end
+    end
+  end
+end