killbill 4.4.0 → 5.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +2 -2
- data/Jarfile +8 -7
- data/Jarfile.lock +8 -7
- data/NEWS +4 -0
- data/gen_config/plugin_api.conf +4 -2
- data/generators/active_merchant/templates/Jarfile.rb +8 -7
- data/generators/active_merchant/templates/config.yml.rb +4 -1
- data/generators/active_merchant/templates/db/ddl.sql.rb +73 -73
- data/generators/active_merchant/templates/plugin.gemspec.rb +1 -0
- data/generators/active_merchant/templates/spec/integration_spec.rb +4 -3
- data/lib/killbill/entitlement.rb +23 -0
- data/lib/killbill/gen/api/entitlement_api.rb +72 -18
- data/lib/killbill/gen/plugin-api/control_result.rb +70 -0
- data/lib/killbill/gen/plugin-api/entitlement_context.rb +215 -0
- data/lib/killbill/gen/plugin-api/entitlement_plugin_api.rb +138 -0
- data/lib/killbill/gen/plugin-api/entitlement_plugin_api_exception.rb +51 -0
- data/lib/killbill/gen/plugin-api/{on_success_payment_routing_result.rb → on_failure_entitlement_result.rb} +3 -3
- data/lib/killbill/gen/plugin-api/{on_failure_payment_routing_result.rb → on_failure_payment_control_result.rb} +23 -4
- data/lib/killbill/gen/plugin-api/on_success_entitlement_result.rb +53 -0
- data/lib/killbill/gen/plugin-api/on_success_payment_control_result.rb +70 -0
- data/lib/killbill/gen/plugin-api/{payment_routing_api_exception.rb → payment_control_api_exception.rb} +2 -2
- data/lib/killbill/gen/plugin-api/{payment_routing_context.rb → payment_control_context.rb} +18 -23
- data/lib/killbill/gen/plugin-api/{payment_routing_plugin_api.rb → payment_control_plugin_api.rb} +15 -15
- data/lib/killbill/gen/plugin-api/prior_entitlement_result.rb +119 -0
- data/lib/killbill/gen/plugin-api/{prior_payment_routing_result.rb → prior_payment_control_result.rb} +21 -21
- data/lib/killbill/gen/plugin-api/require_gen.rb +13 -6
- data/lib/killbill/helpers/active_merchant/active_record/models/payment_method.rb +4 -5
- data/lib/killbill/helpers/active_merchant/active_record/models/response.rb +15 -2
- data/lib/killbill/helpers/active_merchant/configuration.rb +1 -1
- data/lib/killbill/helpers/active_merchant/payment_plugin.rb +1 -1
- data/lib/killbill/killbill_logger.rb +2 -0
- data/lib/killbill/payment_control.rb +4 -4
- data/lib/killbill/version.rb +1 -1
- data/spec/killbill/helpers/payment_method_spec.rb +2 -2
- data/spec/killbill/helpers/payment_plugin_spec.rb +11 -0
- data/spec/killbill/helpers/response_spec.rb +2 -2
- data/spec/killbill/killbill_logger_spec.rb +2 -0
- metadata +17 -9
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 21df35391fbf9f2551bf8ecb5d9fa8193a2d4194
|
4
|
+
data.tar.gz: 9d22abee0b210c4d8c9f4cf59811c2692075ab17
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ae6650bd31d1c941b6cc6050a5a1db32fea55e6550f6883dbc3673288d74d731deaa20aa30caf032427b478078180cd8cfaff72a10dc6d7e96c9e61f2f8250d0
|
7
|
+
data.tar.gz: 7b3e662977b149e2e68f0a62c38272c362c3d19fd40d86efad06c62984d460a8a7437be192d9aa6eda80d96da24c746fe7deb0e00dba378dbfef2b07e637f287
|
data/Gemfile.lock
CHANGED
data/Jarfile
CHANGED
@@ -1,10 +1,11 @@
|
|
1
|
-
jar 'org.kill-bill.billing:killbill-api', '0.
|
2
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.
|
3
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.
|
4
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.
|
5
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.
|
6
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.
|
7
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.
|
1
|
+
jar 'org.kill-bill.billing:killbill-api', '0.19'
|
2
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.12'
|
3
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.12'
|
4
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.12'
|
5
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.12'
|
6
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.12'
|
7
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.12'
|
8
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.12'
|
8
9
|
jar 'org.kill-bill.billing:killbill-util:tests', '0.14.0'
|
9
10
|
jar 'org.mockito:mockito-all', '1.10.19'
|
10
11
|
jar 'javax.servlet:javax.servlet-api', '3.1.0'
|
data/Jarfile.lock
CHANGED
@@ -1,12 +1,13 @@
|
|
1
|
-
org.kill-bill.billing:killbill-api:jar:0.
|
1
|
+
org.kill-bill.billing:killbill-api:jar:0.19
|
2
2
|
com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
|
3
3
|
joda-time:joda-time:jar:2.3
|
4
|
-
org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.
|
5
|
-
org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.
|
6
|
-
org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.
|
7
|
-
org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.
|
8
|
-
org.kill-bill.billing.plugin:killbill-plugin-api-routing:jar:0.
|
9
|
-
org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.
|
4
|
+
org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.12
|
5
|
+
org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.12
|
6
|
+
org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.12
|
7
|
+
org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.12
|
8
|
+
org.kill-bill.billing.plugin:killbill-plugin-api-routing:jar:0.12
|
9
|
+
org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.12
|
10
|
+
org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.12
|
10
11
|
org.kill-bill.billing:killbill-util:jar:tests:0.14.0
|
11
12
|
com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
|
12
13
|
com.fasterxml.jackson.core:jackson-core:jar:2.4.3
|
data/NEWS
CHANGED
data/gen_config/plugin_api.conf
CHANGED
@@ -4,8 +4,9 @@ file://$PATH_TO_REPO/killbill-plugin-api/payment/src/main/java, \
|
|
4
4
|
file://$PATH_TO_REPO/killbill-plugin-api/notification/src/main/java, \
|
5
5
|
file://$PATH_TO_REPO/killbill-plugin-api/invoice/src/main/java, \
|
6
6
|
file://$PATH_TO_REPO/killbill-plugin-api/currency/src/main/java, \
|
7
|
-
file://$PATH_TO_REPO/killbill-plugin-api/
|
7
|
+
file://$PATH_TO_REPO/killbill-plugin-api/control/src/main/java, \
|
8
8
|
file://$PATH_TO_REPO/killbill-plugin-api/catalog/src/main/java, \
|
9
|
+
file://$PATH_TO_REPO/killbill-plugin-api/entitlement/src/main/java, \
|
9
10
|
file://$PATH_TO_REPO/killbill-api/src/main/java/ \
|
10
11
|
-o \
|
11
12
|
/tmp/output \
|
@@ -16,7 +17,8 @@ org.killbill.billing.payment.plugin.api, \
|
|
16
17
|
org.killbill.billing.notification.plugin.api, \
|
17
18
|
org.killbill.billing.invoice.plugin.api \
|
18
19
|
org.killbill.billing.currency.plugin.api \
|
19
|
-
org.killbill.billing.
|
20
|
+
org.killbill.billing.control.plugin.api \
|
20
21
|
org.killbill.billing.catalog.plugin.api \
|
22
|
+
org.killbill.billing.entitlement.plugin.api \
|
21
23
|
-m \
|
22
24
|
JRUBY_PLUGIN_API
|
@@ -1,10 +1,11 @@
|
|
1
|
-
jar 'org.kill-bill.billing:killbill-api', '0.
|
2
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.
|
3
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.
|
4
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.
|
5
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.
|
6
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.
|
7
|
-
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.
|
1
|
+
jar 'org.kill-bill.billing:killbill-api', '0.19'
|
2
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.12'
|
3
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.12'
|
4
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.12'
|
5
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.12'
|
6
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.12'
|
7
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.12'
|
8
|
+
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.12'
|
8
9
|
jar 'org.kill-bill.billing:killbill-util:tests', '0.14.0'
|
9
10
|
jar 'org.mockito:mockito-all', '1.10.19'
|
10
11
|
jar 'javax.servlet:javax.servlet-api', '3.1.0'
|
@@ -5,8 +5,11 @@
|
|
5
5
|
# SQLite (development)
|
6
6
|
:adapter: sqlite3
|
7
7
|
:database: test.db
|
8
|
+
# For PostgreSQL
|
9
|
+
# :adapter: postgresql
|
10
|
+
# :database: 'killbill'
|
8
11
|
# For MySQL
|
9
|
-
# :adapter:
|
12
|
+
# :adapter: mariadb
|
10
13
|
# :username: 'killbill'
|
11
14
|
# :password: 'killbill'
|
12
15
|
# :database: 'killbill' # or set the URL :
|
@@ -1,75 +1,75 @@
|
|
1
|
-
CREATE TABLE
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
PRIMARY KEY (
|
29
|
-
|
30
|
-
|
31
|
-
|
1
|
+
CREATE TABLE <%= identifier %>_payment_methods (
|
2
|
+
id serial UNIQUE,
|
3
|
+
kb_payment_method_id varchar(255) DEFAULT NULL,
|
4
|
+
token varchar(255) DEFAULT NULL,
|
5
|
+
cc_first_name varchar(255) DEFAULT NULL,
|
6
|
+
cc_last_name varchar(255) DEFAULT NULL,
|
7
|
+
cc_type varchar(255) DEFAULT NULL,
|
8
|
+
cc_exp_month varchar(255) DEFAULT NULL,
|
9
|
+
cc_exp_year varchar(255) DEFAULT NULL,
|
10
|
+
cc_number varchar(255) DEFAULT NULL,
|
11
|
+
cc_last_4 varchar(255) DEFAULT NULL,
|
12
|
+
cc_start_month varchar(255) DEFAULT NULL,
|
13
|
+
cc_start_year varchar(255) DEFAULT NULL,
|
14
|
+
cc_issue_number varchar(255) DEFAULT NULL,
|
15
|
+
cc_verification_value varchar(255) DEFAULT NULL,
|
16
|
+
cc_track_data varchar(255) DEFAULT NULL,
|
17
|
+
address1 varchar(255) DEFAULT NULL,
|
18
|
+
address2 varchar(255) DEFAULT NULL,
|
19
|
+
city varchar(255) DEFAULT NULL,
|
20
|
+
state varchar(255) DEFAULT NULL,
|
21
|
+
zip varchar(255) DEFAULT NULL,
|
22
|
+
country varchar(255) DEFAULT NULL,
|
23
|
+
is_deleted boolean NOT NULL DEFAULT '0',
|
24
|
+
created_at datetime NOT NULL,
|
25
|
+
updated_at datetime NOT NULL,
|
26
|
+
kb_account_id varchar(255) DEFAULT NULL,
|
27
|
+
kb_tenant_id varchar(255) DEFAULT NULL,
|
28
|
+
PRIMARY KEY (id)
|
29
|
+
) /*! ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin */;
|
30
|
+
CREATE INDEX index_<%= identifier %>_payment_methods_kb_account_id ON <%= identifier %>_payment_methods(kb_account_id);
|
31
|
+
CREATE INDEX index_<%= identifier %>_payment_methods_kb_payment_method_id ON <%= identifier %>_payment_methods(kb_payment_method_id);
|
32
32
|
|
33
|
-
CREATE TABLE
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
PRIMARY KEY (
|
49
|
-
|
50
|
-
|
33
|
+
CREATE TABLE <%= identifier %>_transactions (
|
34
|
+
id serial UNIQUE,
|
35
|
+
<%= identifier %>_response_id bigint /*! unsigned */ NOT NULL,
|
36
|
+
api_call varchar(255) NOT NULL,
|
37
|
+
kb_payment_id varchar(255) NOT NULL,
|
38
|
+
kb_payment_transaction_id varchar(255) NOT NULL,
|
39
|
+
transaction_type varchar(255) NOT NULL,
|
40
|
+
payment_processor_account_id varchar(255) DEFAULT NULL,
|
41
|
+
txn_id varchar(255) DEFAULT NULL,
|
42
|
+
amount_in_cents int DEFAULT NULL,
|
43
|
+
currency varchar(255) DEFAULT NULL,
|
44
|
+
created_at datetime NOT NULL,
|
45
|
+
updated_at datetime NOT NULL,
|
46
|
+
kb_account_id varchar(255) NOT NULL,
|
47
|
+
kb_tenant_id varchar(255) NOT NULL,
|
48
|
+
PRIMARY KEY (id)
|
49
|
+
) /*! ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin */;
|
50
|
+
CREATE INDEX index_<%= identifier %>_transactions_kb_payment_id ON <%= identifier %>_transactions(kb_payment_id);
|
51
51
|
|
52
|
-
CREATE TABLE
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
PRIMARY KEY (
|
75
|
-
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin
|
52
|
+
CREATE TABLE <%= identifier %>_responses (
|
53
|
+
id serial UNIQUE,
|
54
|
+
api_call varchar(255) NOT NULL,
|
55
|
+
kb_payment_id varchar(255) DEFAULT NULL,
|
56
|
+
kb_payment_transaction_id varchar(255) DEFAULT NULL,
|
57
|
+
transaction_type varchar(255) DEFAULT NULL,
|
58
|
+
payment_processor_account_id varchar(255) DEFAULT NULL,
|
59
|
+
message varchar(255) DEFAULT NULL,
|
60
|
+
authorisation varchar(255) DEFAULT NULL,
|
61
|
+
fraud_review boolean DEFAULT NULL,
|
62
|
+
test boolean DEFAULT NULL,
|
63
|
+
avs_result_code varchar(255) DEFAULT NULL,
|
64
|
+
avs_result_message varchar(255) DEFAULT NULL,
|
65
|
+
avs_result_street_match varchar(255) DEFAULT NULL,
|
66
|
+
avs_result_postal_match varchar(255) DEFAULT NULL,
|
67
|
+
cvv_result_code varchar(255) DEFAULT NULL,
|
68
|
+
cvv_result_message varchar(255) DEFAULT NULL,
|
69
|
+
success boolean DEFAULT NULL,
|
70
|
+
created_at datetime NOT NULL,
|
71
|
+
updated_at datetime NOT NULL,
|
72
|
+
kb_account_id varchar(255) DEFAULT NULL,
|
73
|
+
kb_tenant_id varchar(255) DEFAULT NULL,
|
74
|
+
PRIMARY KEY (id)
|
75
|
+
) /*! ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin */;
|
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
|
|
45
45
|
if defined?(JRUBY_VERSION)
|
46
46
|
s.add_development_dependency 'jdbc-sqlite3', '~> 3.7'
|
47
47
|
s.add_development_dependency 'jdbc-mariadb', '~> 1.1'
|
48
|
+
s.add_development_dependency 'jdbc-postgres', '~> 9.4'
|
48
49
|
else
|
49
50
|
s.add_development_dependency 'sqlite3', '~> 1.3.7'
|
50
51
|
end
|
@@ -7,13 +7,14 @@ describe Killbill::<%= class_name %>::PaymentPlugin do
|
|
7
7
|
include ::Killbill::Plugin::ActiveMerchant::RSpec
|
8
8
|
|
9
9
|
before(:each) do
|
10
|
+
# Start the plugin early to configure ActiveRecord
|
11
|
+
@plugin = build_plugin(::Killbill::<%= class_name %>::PaymentPlugin, '<%= identifier %>')
|
12
|
+
@plugin.start_plugin
|
13
|
+
|
10
14
|
::Killbill::<%= class_name %>::<%= class_name %>PaymentMethod.delete_all
|
11
15
|
::Killbill::<%= class_name %>::<%= class_name %>Response.delete_all
|
12
16
|
::Killbill::<%= class_name %>::<%= class_name %>Transaction.delete_all
|
13
17
|
|
14
|
-
@plugin = build_plugin(::Killbill::<%= class_name %>::PaymentPlugin, '<%= identifier %>')
|
15
|
-
@plugin.start_plugin
|
16
|
-
|
17
18
|
@call_context = build_call_context
|
18
19
|
|
19
20
|
@properties = []
|
@@ -0,0 +1,23 @@
|
|
1
|
+
require 'killbill/plugin'
|
2
|
+
|
3
|
+
module Killbill
|
4
|
+
module Plugin
|
5
|
+
class EntitlementPluginApi < Notification
|
6
|
+
|
7
|
+
class OperationUnsupportedByGatewayError < NotImplementedError
|
8
|
+
end
|
9
|
+
|
10
|
+
def prior_call(entitlement_context, properties)
|
11
|
+
raise OperationUnsupportedByGatewayError
|
12
|
+
end
|
13
|
+
|
14
|
+
def on_success_call(entitlement_context, properties)
|
15
|
+
raise OperationUnsupportedByGatewayError
|
16
|
+
end
|
17
|
+
|
18
|
+
def on_failure_call(entitlement_context, properties)
|
19
|
+
raise OperationUnsupportedByGatewayError
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
@@ -39,8 +39,8 @@ module Killbill
|
|
39
39
|
end
|
40
40
|
|
41
41
|
|
42
|
-
java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement createBaseEntitlement(Java::java.util.UUID, Java::org.killbill.billing.catalog.api.PlanPhaseSpecifier, Java::java.lang.String, Java::java.util.List, Java::org.joda.time.LocalDate, Java::org.killbill.billing.util.callcontext.CallContext)'
|
43
|
-
def create_base_entitlement(accountId, spec, externalKey, overrides, effectiveDate, context)
|
42
|
+
java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement createBaseEntitlement(Java::java.util.UUID, Java::org.killbill.billing.catalog.api.PlanPhaseSpecifier, Java::java.lang.String, Java::java.util.List, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
|
43
|
+
def create_base_entitlement(accountId, spec, externalKey, overrides, effectiveDate, properties, context)
|
44
44
|
|
45
45
|
# conversion for accountId [type = java.util.UUID]
|
46
46
|
accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
|
@@ -65,10 +65,19 @@ module Killbill
|
|
65
65
|
effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
|
66
66
|
end
|
67
67
|
|
68
|
+
# conversion for properties [type = java.lang.Iterable]
|
69
|
+
tmp = java.util.ArrayList.new
|
70
|
+
(properties || []).each do |m|
|
71
|
+
# conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
|
72
|
+
m = m.to_java unless m.nil?
|
73
|
+
tmp.add(m)
|
74
|
+
end
|
75
|
+
properties = tmp
|
76
|
+
|
68
77
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
69
78
|
context = context.to_java unless context.nil?
|
70
79
|
begin
|
71
|
-
res = @real_java_api.create_base_entitlement(accountId, spec, externalKey, overrides, effectiveDate, context)
|
80
|
+
res = @real_java_api.create_base_entitlement(accountId, spec, externalKey, overrides, effectiveDate, properties, context)
|
72
81
|
# conversion for res [type = org.killbill.billing.entitlement.api.Entitlement]
|
73
82
|
res = Killbill::Plugin::Model::Entitlement.new.to_ruby(res) unless res.nil?
|
74
83
|
return res
|
@@ -77,8 +86,8 @@ module Killbill
|
|
77
86
|
end
|
78
87
|
end
|
79
88
|
|
80
|
-
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::org.killbill.billing.util.callcontext.CallContext)'
|
81
|
-
def add_entitlement(bundleId, spec, overrides, effectiveDate, context)
|
89
|
+
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)'
|
90
|
+
def add_entitlement(bundleId, spec, overrides, effectiveDate, properties, context)
|
82
91
|
|
83
92
|
# conversion for bundleId [type = java.util.UUID]
|
84
93
|
bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
|
@@ -100,10 +109,19 @@ module Killbill
|
|
100
109
|
effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
|
101
110
|
end
|
102
111
|
|
112
|
+
# conversion for properties [type = java.lang.Iterable]
|
113
|
+
tmp = java.util.ArrayList.new
|
114
|
+
(properties || []).each do |m|
|
115
|
+
# conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
|
116
|
+
m = m.to_java unless m.nil?
|
117
|
+
tmp.add(m)
|
118
|
+
end
|
119
|
+
properties = tmp
|
120
|
+
|
103
121
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
104
122
|
context = context.to_java unless context.nil?
|
105
123
|
begin
|
106
|
-
res = @real_java_api.add_entitlement(bundleId, spec, overrides, effectiveDate, context)
|
124
|
+
res = @real_java_api.add_entitlement(bundleId, spec, overrides, effectiveDate, properties, context)
|
107
125
|
# conversion for res [type = org.killbill.billing.entitlement.api.Entitlement]
|
108
126
|
res = Killbill::Plugin::Model::Entitlement.new.to_ruby(res) unless res.nil?
|
109
127
|
return res
|
@@ -144,8 +162,8 @@ module Killbill
|
|
144
162
|
end
|
145
163
|
end
|
146
164
|
|
147
|
-
java_signature 'Java::void pause(Java::java.util.UUID, Java::org.joda.time.LocalDate, Java::org.killbill.billing.util.callcontext.CallContext)'
|
148
|
-
def pause(bundleId, effectiveDate, context)
|
165
|
+
java_signature 'Java::void pause(Java::java.util.UUID, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
|
166
|
+
def pause(bundleId, effectiveDate, properties, context)
|
149
167
|
|
150
168
|
# conversion for bundleId [type = java.util.UUID]
|
151
169
|
bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
|
@@ -155,13 +173,22 @@ module Killbill
|
|
155
173
|
effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
|
156
174
|
end
|
157
175
|
|
176
|
+
# conversion for properties [type = java.lang.Iterable]
|
177
|
+
tmp = java.util.ArrayList.new
|
178
|
+
(properties || []).each do |m|
|
179
|
+
# conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
|
180
|
+
m = m.to_java unless m.nil?
|
181
|
+
tmp.add(m)
|
182
|
+
end
|
183
|
+
properties = tmp
|
184
|
+
|
158
185
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
159
186
|
context = context.to_java unless context.nil?
|
160
|
-
@real_java_api.pause(bundleId, effectiveDate, context)
|
187
|
+
@real_java_api.pause(bundleId, effectiveDate, properties, context)
|
161
188
|
end
|
162
189
|
|
163
|
-
java_signature 'Java::void resume(Java::java.util.UUID, Java::org.joda.time.LocalDate, Java::org.killbill.billing.util.callcontext.CallContext)'
|
164
|
-
def resume(bundleId, effectiveDate, context)
|
190
|
+
java_signature 'Java::void resume(Java::java.util.UUID, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
|
191
|
+
def resume(bundleId, effectiveDate, properties, context)
|
165
192
|
|
166
193
|
# conversion for bundleId [type = java.util.UUID]
|
167
194
|
bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
|
@@ -171,9 +198,18 @@ module Killbill
|
|
171
198
|
effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
|
172
199
|
end
|
173
200
|
|
201
|
+
# conversion for properties [type = java.lang.Iterable]
|
202
|
+
tmp = java.util.ArrayList.new
|
203
|
+
(properties || []).each do |m|
|
204
|
+
# conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
|
205
|
+
m = m.to_java unless m.nil?
|
206
|
+
tmp.add(m)
|
207
|
+
end
|
208
|
+
properties = tmp
|
209
|
+
|
174
210
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
175
211
|
context = context.to_java unless context.nil?
|
176
|
-
@real_java_api.resume(bundleId, effectiveDate, context)
|
212
|
+
@real_java_api.resume(bundleId, effectiveDate, properties, context)
|
177
213
|
end
|
178
214
|
|
179
215
|
java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement getEntitlementForId(Java::java.util.UUID, Java::org.killbill.billing.util.callcontext.TenantContext)'
|
@@ -269,8 +305,8 @@ module Killbill
|
|
269
305
|
end
|
270
306
|
end
|
271
307
|
|
272
|
-
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::org.killbill.billing.util.callcontext.CallContext)'
|
273
|
-
def transfer_entitlements(sourceAccountId, destAccountId, externalKey, effectiveDate, context)
|
308
|
+
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::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
|
309
|
+
def transfer_entitlements(sourceAccountId, destAccountId, externalKey, effectiveDate, properties, context)
|
274
310
|
|
275
311
|
# conversion for sourceAccountId [type = java.util.UUID]
|
276
312
|
sourceAccountId = java.util.UUID.fromString(sourceAccountId.to_s) unless sourceAccountId.nil?
|
@@ -286,10 +322,19 @@ module Killbill
|
|
286
322
|
effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
|
287
323
|
end
|
288
324
|
|
325
|
+
# conversion for properties [type = java.lang.Iterable]
|
326
|
+
tmp = java.util.ArrayList.new
|
327
|
+
(properties || []).each do |m|
|
328
|
+
# conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
|
329
|
+
m = m.to_java unless m.nil?
|
330
|
+
tmp.add(m)
|
331
|
+
end
|
332
|
+
properties = tmp
|
333
|
+
|
289
334
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
290
335
|
context = context.to_java unless context.nil?
|
291
336
|
begin
|
292
|
-
res = @real_java_api.transfer_entitlements(sourceAccountId, destAccountId, externalKey, effectiveDate, context)
|
337
|
+
res = @real_java_api.transfer_entitlements(sourceAccountId, destAccountId, externalKey, effectiveDate, properties, context)
|
293
338
|
# conversion for res [type = java.util.UUID]
|
294
339
|
res = res.nil? ? nil : res.to_s
|
295
340
|
return res
|
@@ -298,8 +343,8 @@ module Killbill
|
|
298
343
|
end
|
299
344
|
end
|
300
345
|
|
301
|
-
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::org.killbill.billing.catalog.api.BillingActionPolicy, Java::org.killbill.billing.util.callcontext.CallContext)'
|
302
|
-
def transfer_entitlements_override_billing_policy(sourceAccountId, destAccountId, externalKey, effectiveDate, billingPolicy, context)
|
346
|
+
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::org.killbill.billing.catalog.api.BillingActionPolicy, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
|
347
|
+
def transfer_entitlements_override_billing_policy(sourceAccountId, destAccountId, externalKey, effectiveDate, billingPolicy, properties, context)
|
303
348
|
|
304
349
|
# conversion for sourceAccountId [type = java.util.UUID]
|
305
350
|
sourceAccountId = java.util.UUID.fromString(sourceAccountId.to_s) unless sourceAccountId.nil?
|
@@ -318,10 +363,19 @@ module Killbill
|
|
318
363
|
# conversion for billingPolicy [type = org.killbill.billing.catalog.api.BillingActionPolicy]
|
319
364
|
billingPolicy = Java::org.killbill.billing.catalog.api.BillingActionPolicy.value_of( billingPolicy.to_s ) unless billingPolicy.nil?
|
320
365
|
|
366
|
+
# conversion for properties [type = java.lang.Iterable]
|
367
|
+
tmp = java.util.ArrayList.new
|
368
|
+
(properties || []).each do |m|
|
369
|
+
# conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
|
370
|
+
m = m.to_java unless m.nil?
|
371
|
+
tmp.add(m)
|
372
|
+
end
|
373
|
+
properties = tmp
|
374
|
+
|
321
375
|
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
322
376
|
context = context.to_java unless context.nil?
|
323
377
|
begin
|
324
|
-
res = @real_java_api.transfer_entitlements_override_billing_policy(sourceAccountId, destAccountId, externalKey, effectiveDate, billingPolicy, context)
|
378
|
+
res = @real_java_api.transfer_entitlements_override_billing_policy(sourceAccountId, destAccountId, externalKey, effectiveDate, billingPolicy, properties, context)
|
325
379
|
# conversion for res [type = java.util.UUID]
|
326
380
|
res = res.nil? ? nil : res.to_s
|
327
381
|
return res
|