killbill 2.0.1 → 3.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Jarfile +5 -5
- data/NEWS +3 -0
- data/VERSION +1 -1
- data/gen_config/api.conf +34 -34
- data/gen_config/plugin_api.conf +3 -3
- data/killbill.gemspec +2 -2
- data/lib/killbill.rb +11 -11
- data/lib/killbill/gen/api/account.rb +5 -5
- data/lib/killbill/gen/api/account_api_exception.rb +1 -1
- data/lib/killbill/gen/api/account_audit_logs.rb +32 -32
- data/lib/killbill/gen/api/account_audit_logs_for_object_type.rb +4 -4
- data/lib/killbill/gen/api/account_data.rb +5 -5
- data/lib/killbill/gen/api/account_email.rb +2 -2
- data/lib/killbill/gen/api/account_user_api.rb +36 -36
- data/lib/killbill/gen/api/audit_log.rb +8 -8
- data/lib/killbill/gen/api/audit_user_api.rb +14 -14
- data/lib/killbill/gen/api/billing_exception_base.rb +1 -1
- data/lib/killbill/gen/api/blockable.rb +2 -2
- data/lib/killbill/gen/api/blocking_api_exception.rb +1 -1
- data/lib/killbill/gen/api/blocking_state.rb +5 -5
- data/lib/killbill/gen/api/call_context.rb +8 -8
- data/lib/killbill/gen/api/catalog.rb +9 -9
- data/lib/killbill/gen/api/catalog_api_exception.rb +1 -1
- data/lib/killbill/gen/api/catalog_user_api.rb +5 -5
- data/lib/killbill/gen/api/column_info.rb +2 -2
- data/lib/killbill/gen/api/control_tag.rb +8 -8
- data/lib/killbill/gen/api/currency_conversion.rb +7 -7
- data/lib/killbill/gen/api/currency_conversion_api.rb +14 -14
- data/lib/killbill/gen/api/currency_conversion_exception.rb +1 -1
- data/lib/killbill/gen/api/currency_value_null.rb +1 -1
- data/lib/killbill/gen/api/custom_field.rb +5 -5
- data/lib/killbill/gen/api/custom_field_api_exception.rb +1 -1
- data/lib/killbill/gen/api/custom_field_user_api.rb +27 -27
- data/lib/killbill/gen/api/database_export_output_stream.rb +2 -2
- data/lib/killbill/gen/api/duration.rb +5 -5
- data/lib/killbill/gen/api/entitlement.rb +19 -19
- data/lib/killbill/gen/api/entitlement_ao_status_dry_run.rb +11 -11
- data/lib/killbill/gen/api/entitlement_api.rb +44 -44
- data/lib/killbill/gen/api/entitlement_api_exception.rb +1 -1
- data/lib/killbill/gen/api/entity.rb +2 -2
- data/lib/killbill/gen/api/illegal_plan_change.rb +1 -1
- data/lib/killbill/gen/api/international_price.rb +4 -4
- data/lib/killbill/gen/api/invalid_config_exception.rb +1 -1
- data/lib/killbill/gen/api/invoice.rb +9 -9
- data/lib/killbill/gen/api/invoice_api_exception.rb +1 -1
- data/lib/killbill/gen/api/invoice_creation_event.rb +2 -2
- data/lib/killbill/gen/api/invoice_formatter.rb +12 -12
- data/lib/killbill/gen/api/invoice_item.rb +8 -8
- data/lib/killbill/gen/api/invoice_item_formatter.rb +8 -8
- data/lib/killbill/gen/api/invoice_payment.rb +11 -11
- data/lib/killbill/gen/api/invoice_payment_api.rb +34 -34
- data/lib/killbill/gen/api/invoice_user_api.rb +90 -90
- data/lib/killbill/gen/api/limit.rb +4 -4
- data/lib/killbill/gen/api/listing.rb +6 -6
- data/lib/killbill/gen/api/migration_plan.rb +13 -13
- data/lib/killbill/gen/api/mutable_account_data.rb +5 -5
- data/lib/killbill/gen/api/osgi_killbill.rb +34 -34
- data/lib/killbill/gen/api/osgi_plugin_properties.rb +2 -2
- data/lib/killbill/gen/api/pagination.rb +2 -2
- data/lib/killbill/gen/api/payment.rb +12 -12
- data/lib/killbill/gen/api/payment_api.rb +103 -103
- data/lib/killbill/gen/api/payment_api_exception.rb +1 -1
- data/lib/killbill/gen/api/payment_attempt.rb +5 -5
- data/lib/killbill/gen/api/payment_method.rb +4 -4
- data/lib/killbill/gen/api/payment_method_kv_info.rb +1 -1
- data/lib/killbill/gen/api/payment_method_plugin.rb +4 -4
- data/lib/killbill/gen/api/plan.rb +13 -13
- data/lib/killbill/gen/api/plan_change_result.rb +9 -9
- data/lib/killbill/gen/api/plan_phase.rb +18 -18
- data/lib/killbill/gen/api/plan_phase_specifier.rb +10 -10
- data/lib/killbill/gen/api/plan_specifier.rb +7 -7
- data/lib/killbill/gen/api/plugin_config_service_api.rb +6 -6
- data/lib/killbill/gen/api/price.rb +5 -5
- data/lib/killbill/gen/api/price_list.rb +4 -4
- data/lib/killbill/gen/api/price_list_set.rb +4 -4
- data/lib/killbill/gen/api/product.rb +11 -11
- data/lib/killbill/gen/api/rate.rb +8 -8
- data/lib/killbill/gen/api/record_id_api.rb +6 -6
- data/lib/killbill/gen/api/refund.rb +10 -10
- data/lib/killbill/gen/api/rolled_up_usage.rb +2 -2
- data/lib/killbill/gen/api/security_api_exception.rb +1 -1
- data/lib/killbill/gen/api/static_catalog.rb +15 -15
- data/lib/killbill/gen/api/subscription.rb +19 -19
- data/lib/killbill/gen/api/subscription_api.rb +34 -34
- data/lib/killbill/gen/api/subscription_api_exception.rb +1 -1
- data/lib/killbill/gen/api/subscription_bundle.rb +6 -6
- data/lib/killbill/gen/api/subscription_bundle_timeline.rb +4 -4
- data/lib/killbill/gen/api/subscription_event.rb +27 -27
- data/lib/killbill/gen/api/tag.rb +5 -5
- data/lib/killbill/gen/api/tag_api_exception.rb +1 -1
- data/lib/killbill/gen/api/tag_definition.rb +5 -5
- data/lib/killbill/gen/api/tag_definition_api_exception.rb +1 -1
- data/lib/killbill/gen/api/tag_user_api.rb +54 -54
- data/lib/killbill/gen/api/tenant.rb +2 -2
- data/lib/killbill/gen/api/tenant_api_exception.rb +1 -1
- data/lib/killbill/gen/api/tenant_context.rb +2 -2
- data/lib/killbill/gen/api/tenant_data.rb +2 -2
- data/lib/killbill/gen/api/tenant_kv.rb +2 -2
- data/lib/killbill/gen/api/tenant_user_api.rb +20 -20
- data/lib/killbill/gen/api/unit.rb +2 -2
- data/lib/killbill/gen/api/usage_user_api.rb +7 -7
- data/lib/killbill/gen/plugin-api/currency_plugin_api.rb +19 -19
- data/lib/killbill/gen/plugin-api/ext_bus_event.rb +8 -8
- data/lib/killbill/gen/plugin-api/notification_plugin_api.rb +5 -5
- data/lib/killbill/gen/plugin-api/payment_info_plugin.rb +8 -8
- data/lib/killbill/gen/plugin-api/payment_method_info_plugin.rb +2 -2
- data/lib/killbill/gen/plugin-api/payment_plugin_api.rb +52 -52
- data/lib/killbill/gen/plugin-api/payment_plugin_api_exception.rb +1 -1
- data/lib/killbill/gen/plugin-api/refund_info_plugin.rb +8 -8
- data/lib/killbill/http_servlet.rb +1 -1
- data/lib/killbill/jnotification.rb +3 -3
- data/spec/killbill/killbill_integration_spec.rb +1 -1
- data/spec/killbill/notification_plugin_api_spec.rb +3 -3
- data/spec/killbill/payment_plugin_api_spec.rb +13 -13
- data/spec/spec_helper.rb +1 -1
- metadata +5 -5
@@ -27,10 +27,10 @@ module Killbill
|
|
27
27
|
module Plugin
|
28
28
|
module Model
|
29
29
|
|
30
|
-
java_package '
|
30
|
+
java_package 'org.killbill.billing.util.audit'
|
31
31
|
class AccountAuditLogsForObjectType
|
32
32
|
|
33
|
-
include
|
33
|
+
include org.killbill.billing.util.audit.AccountAuditLogsForObjectType
|
34
34
|
|
35
35
|
attr_accessor :audit_logs
|
36
36
|
|
@@ -41,7 +41,7 @@ module Killbill
|
|
41
41
|
# conversion for audit_logs [type = java.util.List]
|
42
42
|
tmp = java.util.ArrayList.new
|
43
43
|
(@audit_logs || []).each do |m|
|
44
|
-
# conversion for m [type =
|
44
|
+
# conversion for m [type = org.killbill.billing.util.audit.AuditLog]
|
45
45
|
m = m.to_java unless m.nil?
|
46
46
|
tmp.add(m)
|
47
47
|
end
|
@@ -54,7 +54,7 @@ module Killbill
|
|
54
54
|
@audit_logs = j_obj.audit_logs
|
55
55
|
tmp = []
|
56
56
|
(@audit_logs || []).each do |m|
|
57
|
-
# conversion for m [type =
|
57
|
+
# conversion for m [type = org.killbill.billing.util.audit.AuditLog]
|
58
58
|
m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
|
59
59
|
tmp << m
|
60
60
|
end
|
@@ -27,10 +27,10 @@ module Killbill
|
|
27
27
|
module Plugin
|
28
28
|
module Model
|
29
29
|
|
30
|
-
java_package '
|
30
|
+
java_package 'org.killbill.billing.account.api'
|
31
31
|
class AccountData
|
32
32
|
|
33
|
-
include
|
33
|
+
include org.killbill.billing.account.api.AccountData
|
34
34
|
|
35
35
|
attr_accessor :external_key, :name, :first_name_length, :email, :bill_cycle_day_local, :currency, :payment_method_id, :time_zone, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices
|
36
36
|
|
@@ -53,8 +53,8 @@ module Killbill
|
|
53
53
|
# conversion for bill_cycle_day_local [type = java.lang.Integer]
|
54
54
|
@bill_cycle_day_local = @bill_cycle_day_local
|
55
55
|
|
56
|
-
# conversion for currency [type =
|
57
|
-
@currency = Java::
|
56
|
+
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
57
|
+
@currency = Java::org.killbill.billing.catalog.api.Currency.value_of("#{@currency.to_s}") unless @currency.nil?
|
58
58
|
|
59
59
|
# conversion for payment_method_id [type = java.util.UUID]
|
60
60
|
@payment_method_id = java.util.UUID.fromString(@payment_method_id.to_s) unless @payment_method_id.nil?
|
@@ -115,7 +115,7 @@ module Killbill
|
|
115
115
|
# conversion for bill_cycle_day_local [type = java.lang.Integer]
|
116
116
|
@bill_cycle_day_local = j_obj.bill_cycle_day_local
|
117
117
|
|
118
|
-
# conversion for currency [type =
|
118
|
+
# conversion for currency [type = org.killbill.billing.catalog.api.Currency]
|
119
119
|
@currency = j_obj.currency
|
120
120
|
@currency = @currency.to_s.to_sym unless @currency.nil?
|
121
121
|
|
@@ -27,10 +27,10 @@ module Killbill
|
|
27
27
|
module Plugin
|
28
28
|
module Model
|
29
29
|
|
30
|
-
java_package '
|
30
|
+
java_package 'org.killbill.billing.account.api'
|
31
31
|
class AccountEmail
|
32
32
|
|
33
|
-
include
|
33
|
+
include org.killbill.billing.account.api.AccountEmail
|
34
34
|
|
35
35
|
attr_accessor :id, :created_date, :updated_date, :account_id, :email
|
36
36
|
|
@@ -27,82 +27,82 @@ module Killbill
|
|
27
27
|
module Plugin
|
28
28
|
module Api
|
29
29
|
|
30
|
-
java_package '
|
30
|
+
java_package 'org.killbill.billing.account.api'
|
31
31
|
class AccountUserApi
|
32
32
|
|
33
|
-
include
|
33
|
+
include org.killbill.billing.account.api.AccountUserApi
|
34
34
|
|
35
35
|
def initialize(real_java_api)
|
36
36
|
@real_java_api = real_java_api
|
37
37
|
end
|
38
38
|
|
39
39
|
|
40
|
-
java_signature 'Java::
|
40
|
+
java_signature 'Java::org.killbill.billing.account.api.Account createAccount(Java::org.killbill.billing.account.api.AccountData, Java::org.killbill.billing.util.callcontext.CallContext)'
|
41
41
|
def create_account(data, context)
|
42
42
|
|
43
|
-
# conversion for data [type =
|
43
|
+
# conversion for data [type = org.killbill.billing.account.api.AccountData]
|
44
44
|
data = data.to_java unless data.nil?
|
45
45
|
|
46
|
-
# conversion for context [type =
|
46
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
47
47
|
context = context.to_java unless context.nil?
|
48
48
|
begin
|
49
49
|
res = @real_java_api.create_account(data, context)
|
50
|
-
# conversion for res [type =
|
50
|
+
# conversion for res [type = org.killbill.billing.account.api.Account]
|
51
51
|
res = Killbill::Plugin::Model::Account.new.to_ruby(res) unless res.nil?
|
52
52
|
return res
|
53
|
-
rescue Java::
|
53
|
+
rescue Java::org.killbill.billing.account.api.AccountApiException => e
|
54
54
|
raise Killbill::Plugin::Model::AccountApiException.new.to_ruby(e)
|
55
55
|
end
|
56
56
|
end
|
57
57
|
|
58
|
-
java_signature 'Java::void updateAccount(Java::
|
58
|
+
java_signature 'Java::void updateAccount(Java::org.killbill.billing.account.api.Account, Java::org.killbill.billing.util.callcontext.CallContext)'
|
59
59
|
def update_account(account, context)
|
60
60
|
|
61
|
-
# conversion for account [type =
|
61
|
+
# conversion for account [type = org.killbill.billing.account.api.Account]
|
62
62
|
account = account.to_java unless account.nil?
|
63
63
|
|
64
|
-
# conversion for context [type =
|
64
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
65
65
|
context = context.to_java unless context.nil?
|
66
66
|
@real_java_api.update_account(account, context)
|
67
67
|
end
|
68
68
|
|
69
|
-
java_signature 'Java::
|
69
|
+
java_signature 'Java::org.killbill.billing.account.api.Account getAccountByKey(Java::java.lang.String, Java::org.killbill.billing.util.callcontext.TenantContext)'
|
70
70
|
def get_account_by_key(key, context)
|
71
71
|
|
72
72
|
# conversion for key [type = java.lang.String]
|
73
73
|
key = key.to_s unless key.nil?
|
74
74
|
|
75
|
-
# conversion for context [type =
|
75
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
|
76
76
|
context = context.to_java unless context.nil?
|
77
77
|
begin
|
78
78
|
res = @real_java_api.get_account_by_key(key, context)
|
79
|
-
# conversion for res [type =
|
79
|
+
# conversion for res [type = org.killbill.billing.account.api.Account]
|
80
80
|
res = Killbill::Plugin::Model::Account.new.to_ruby(res) unless res.nil?
|
81
81
|
return res
|
82
|
-
rescue Java::
|
82
|
+
rescue Java::org.killbill.billing.account.api.AccountApiException => e
|
83
83
|
raise Killbill::Plugin::Model::AccountApiException.new.to_ruby(e)
|
84
84
|
end
|
85
85
|
end
|
86
86
|
|
87
|
-
java_signature 'Java::
|
87
|
+
java_signature 'Java::org.killbill.billing.account.api.Account getAccountById(Java::java.util.UUID, Java::org.killbill.billing.util.callcontext.TenantContext)'
|
88
88
|
def get_account_by_id(accountId, context)
|
89
89
|
|
90
90
|
# conversion for accountId [type = java.util.UUID]
|
91
91
|
accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
|
92
92
|
|
93
|
-
# conversion for context [type =
|
93
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
|
94
94
|
context = context.to_java unless context.nil?
|
95
95
|
begin
|
96
96
|
res = @real_java_api.get_account_by_id(accountId, context)
|
97
|
-
# conversion for res [type =
|
97
|
+
# conversion for res [type = org.killbill.billing.account.api.Account]
|
98
98
|
res = Killbill::Plugin::Model::Account.new.to_ruby(res) unless res.nil?
|
99
99
|
return res
|
100
|
-
rescue Java::
|
100
|
+
rescue Java::org.killbill.billing.account.api.AccountApiException => e
|
101
101
|
raise Killbill::Plugin::Model::AccountApiException.new.to_ruby(e)
|
102
102
|
end
|
103
103
|
end
|
104
104
|
|
105
|
-
java_signature 'Java::
|
105
|
+
java_signature 'Java::org.killbill.billing.util.entity.Pagination searchAccounts(Java::java.lang.String, Java::java.lang.Long, Java::java.lang.Long, Java::org.killbill.billing.util.callcontext.TenantContext)'
|
106
106
|
def search_accounts(searchKey, offset, limit, context)
|
107
107
|
|
108
108
|
# conversion for searchKey [type = java.lang.String]
|
@@ -114,15 +114,15 @@ module Killbill
|
|
114
114
|
# conversion for limit [type = java.lang.Long]
|
115
115
|
limit = limit
|
116
116
|
|
117
|
-
# conversion for context [type =
|
117
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
|
118
118
|
context = context.to_java unless context.nil?
|
119
119
|
res = @real_java_api.search_accounts(searchKey, offset, limit, context)
|
120
|
-
# conversion for res [type =
|
120
|
+
# conversion for res [type = org.killbill.billing.util.entity.Pagination]
|
121
121
|
res = Killbill::Plugin::Model::Pagination.new.to_ruby(res) unless res.nil?
|
122
122
|
return res
|
123
123
|
end
|
124
124
|
|
125
|
-
java_signature 'Java::
|
125
|
+
java_signature 'Java::org.killbill.billing.util.entity.Pagination getAccounts(Java::java.lang.Long, Java::java.lang.Long, Java::org.killbill.billing.util.callcontext.TenantContext)'
|
126
126
|
def get_accounts(offset, limit, context)
|
127
127
|
|
128
128
|
# conversion for offset [type = java.lang.Long]
|
@@ -131,45 +131,45 @@ module Killbill
|
|
131
131
|
# conversion for limit [type = java.lang.Long]
|
132
132
|
limit = limit
|
133
133
|
|
134
|
-
# conversion for context [type =
|
134
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
|
135
135
|
context = context.to_java unless context.nil?
|
136
136
|
res = @real_java_api.get_accounts(offset, limit, context)
|
137
|
-
# conversion for res [type =
|
137
|
+
# conversion for res [type = org.killbill.billing.util.entity.Pagination]
|
138
138
|
res = Killbill::Plugin::Model::Pagination.new.to_ruby(res) unless res.nil?
|
139
139
|
return res
|
140
140
|
end
|
141
141
|
|
142
|
-
java_signature 'Java::java.util.UUID getIdFromKey(Java::java.lang.String, Java::
|
142
|
+
java_signature 'Java::java.util.UUID getIdFromKey(Java::java.lang.String, Java::org.killbill.billing.util.callcontext.TenantContext)'
|
143
143
|
def get_id_from_key(externalKey, context)
|
144
144
|
|
145
145
|
# conversion for externalKey [type = java.lang.String]
|
146
146
|
externalKey = externalKey.to_s unless externalKey.nil?
|
147
147
|
|
148
|
-
# conversion for context [type =
|
148
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
|
149
149
|
context = context.to_java unless context.nil?
|
150
150
|
begin
|
151
151
|
res = @real_java_api.get_id_from_key(externalKey, context)
|
152
152
|
# conversion for res [type = java.util.UUID]
|
153
153
|
res = res.nil? ? nil : res.to_s
|
154
154
|
return res
|
155
|
-
rescue Java::
|
155
|
+
rescue Java::org.killbill.billing.account.api.AccountApiException => e
|
156
156
|
raise Killbill::Plugin::Model::AccountApiException.new.to_ruby(e)
|
157
157
|
end
|
158
158
|
end
|
159
159
|
|
160
|
-
java_signature 'Java::java.util.List getEmails(Java::java.util.UUID, Java::
|
160
|
+
java_signature 'Java::java.util.List getEmails(Java::java.util.UUID, Java::org.killbill.billing.util.callcontext.TenantContext)'
|
161
161
|
def get_emails(accountId, context)
|
162
162
|
|
163
163
|
# conversion for accountId [type = java.util.UUID]
|
164
164
|
accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
|
165
165
|
|
166
|
-
# conversion for context [type =
|
166
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
|
167
167
|
context = context.to_java unless context.nil?
|
168
168
|
res = @real_java_api.get_emails(accountId, context)
|
169
169
|
# conversion for res [type = java.util.List]
|
170
170
|
tmp = []
|
171
171
|
(res || []).each do |m|
|
172
|
-
# conversion for m [type =
|
172
|
+
# conversion for m [type = org.killbill.billing.account.api.AccountEmail]
|
173
173
|
m = Killbill::Plugin::Model::AccountEmail.new.to_ruby(m) unless m.nil?
|
174
174
|
tmp << m
|
175
175
|
end
|
@@ -177,30 +177,30 @@ module Killbill
|
|
177
177
|
return res
|
178
178
|
end
|
179
179
|
|
180
|
-
java_signature 'Java::void addEmail(Java::java.util.UUID, Java::
|
180
|
+
java_signature 'Java::void addEmail(Java::java.util.UUID, Java::org.killbill.billing.account.api.AccountEmail, Java::org.killbill.billing.util.callcontext.CallContext)'
|
181
181
|
def add_email(accountId, email, context)
|
182
182
|
|
183
183
|
# conversion for accountId [type = java.util.UUID]
|
184
184
|
accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
|
185
185
|
|
186
|
-
# conversion for email [type =
|
186
|
+
# conversion for email [type = org.killbill.billing.account.api.AccountEmail]
|
187
187
|
email = email.to_java unless email.nil?
|
188
188
|
|
189
|
-
# conversion for context [type =
|
189
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
190
190
|
context = context.to_java unless context.nil?
|
191
191
|
@real_java_api.add_email(accountId, email, context)
|
192
192
|
end
|
193
193
|
|
194
|
-
java_signature 'Java::void removeEmail(Java::java.util.UUID, Java::
|
194
|
+
java_signature 'Java::void removeEmail(Java::java.util.UUID, Java::org.killbill.billing.account.api.AccountEmail, Java::org.killbill.billing.util.callcontext.CallContext)'
|
195
195
|
def remove_email(accountId, email, context)
|
196
196
|
|
197
197
|
# conversion for accountId [type = java.util.UUID]
|
198
198
|
accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
|
199
199
|
|
200
|
-
# conversion for email [type =
|
200
|
+
# conversion for email [type = org.killbill.billing.account.api.AccountEmail]
|
201
201
|
email = email.to_java unless email.nil?
|
202
202
|
|
203
|
-
# conversion for context [type =
|
203
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
204
204
|
context = context.to_java unless context.nil?
|
205
205
|
@real_java_api.remove_email(accountId, email, context)
|
206
206
|
end
|
@@ -27,10 +27,10 @@ module Killbill
|
|
27
27
|
module Plugin
|
28
28
|
module Model
|
29
29
|
|
30
|
-
java_package '
|
30
|
+
java_package 'org.killbill.billing.util.audit'
|
31
31
|
class AuditLog
|
32
32
|
|
33
|
-
include
|
33
|
+
include org.killbill.billing.util.audit.AuditLog
|
34
34
|
|
35
35
|
attr_accessor :id, :created_date, :updated_date, :audited_entity_id, :audited_object_type, :change_type, :user_name, :reason_code, :user_token, :comment
|
36
36
|
|
@@ -56,11 +56,11 @@ module Killbill
|
|
56
56
|
# conversion for audited_entity_id [type = java.util.UUID]
|
57
57
|
@audited_entity_id = java.util.UUID.fromString(@audited_entity_id.to_s) unless @audited_entity_id.nil?
|
58
58
|
|
59
|
-
# conversion for audited_object_type [type =
|
60
|
-
@audited_object_type = Java::
|
59
|
+
# conversion for audited_object_type [type = org.killbill.billing.ObjectType]
|
60
|
+
@audited_object_type = Java::org.killbill.billing.ObjectType.value_of("#{@audited_object_type.to_s}") unless @audited_object_type.nil?
|
61
61
|
|
62
|
-
# conversion for change_type [type =
|
63
|
-
@change_type = Java::
|
62
|
+
# conversion for change_type [type = org.killbill.billing.util.audit.ChangeType]
|
63
|
+
@change_type = Java::org.killbill.billing.util.audit.ChangeType.value_of("#{@change_type.to_s}") unless @change_type.nil?
|
64
64
|
|
65
65
|
# conversion for user_name [type = java.lang.String]
|
66
66
|
@user_name = @user_name.to_s unless @user_name.nil?
|
@@ -101,11 +101,11 @@ module Killbill
|
|
101
101
|
@audited_entity_id = j_obj.audited_entity_id
|
102
102
|
@audited_entity_id = @audited_entity_id.nil? ? nil : @audited_entity_id.to_s
|
103
103
|
|
104
|
-
# conversion for audited_object_type [type =
|
104
|
+
# conversion for audited_object_type [type = org.killbill.billing.ObjectType]
|
105
105
|
@audited_object_type = j_obj.audited_object_type
|
106
106
|
@audited_object_type = @audited_object_type.to_s.to_sym unless @audited_object_type.nil?
|
107
107
|
|
108
|
-
# conversion for change_type [type =
|
108
|
+
# conversion for change_type [type = org.killbill.billing.util.audit.ChangeType]
|
109
109
|
@change_type = j_obj.change_type
|
110
110
|
@change_type = @change_type.to_s.to_sym unless @change_type.nil?
|
111
111
|
|
@@ -27,52 +27,52 @@ module Killbill
|
|
27
27
|
module Plugin
|
28
28
|
module Api
|
29
29
|
|
30
|
-
java_package '
|
30
|
+
java_package 'org.killbill.billing.util.api'
|
31
31
|
class AuditUserApi
|
32
32
|
|
33
|
-
include
|
33
|
+
include org.killbill.billing.util.api.AuditUserApi
|
34
34
|
|
35
35
|
def initialize(real_java_api)
|
36
36
|
@real_java_api = real_java_api
|
37
37
|
end
|
38
38
|
|
39
39
|
|
40
|
-
java_signature 'Java::
|
40
|
+
java_signature 'Java::org.killbill.billing.util.audit.AccountAuditLogs getAccountAuditLogs(Java::java.util.UUID, Java::org.killbill.billing.util.api.AuditLevel, Java::org.killbill.billing.util.callcontext.TenantContext)'
|
41
41
|
def get_account_audit_logs(accountId, auditLevel, context)
|
42
42
|
|
43
43
|
# conversion for accountId [type = java.util.UUID]
|
44
44
|
accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
|
45
45
|
|
46
|
-
# conversion for auditLevel [type =
|
47
|
-
auditLevel = Java::
|
46
|
+
# conversion for auditLevel [type = org.killbill.billing.util.api.AuditLevel]
|
47
|
+
auditLevel = Java::org.killbill.billing.util.api.AuditLevel.value_of("#{auditLevel.to_s}") unless auditLevel.nil?
|
48
48
|
|
49
|
-
# conversion for context [type =
|
49
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
|
50
50
|
context = context.to_java unless context.nil?
|
51
51
|
res = @real_java_api.get_account_audit_logs(accountId, auditLevel, context)
|
52
|
-
# conversion for res [type =
|
52
|
+
# conversion for res [type = org.killbill.billing.util.audit.AccountAuditLogs]
|
53
53
|
res = Killbill::Plugin::Model::AccountAuditLogs.new.to_ruby(res) unless res.nil?
|
54
54
|
return res
|
55
55
|
end
|
56
56
|
|
57
|
-
java_signature 'Java::java.util.List getAuditLogs(Java::java.util.UUID, Java::
|
57
|
+
java_signature 'Java::java.util.List getAuditLogs(Java::java.util.UUID, Java::org.killbill.billing.ObjectType, Java::org.killbill.billing.util.api.AuditLevel, Java::org.killbill.billing.util.callcontext.TenantContext)'
|
58
58
|
def get_audit_logs(objectId, objectType, auditLevel, context)
|
59
59
|
|
60
60
|
# conversion for objectId [type = java.util.UUID]
|
61
61
|
objectId = java.util.UUID.fromString(objectId.to_s) unless objectId.nil?
|
62
62
|
|
63
|
-
# conversion for objectType [type =
|
64
|
-
objectType = Java::
|
63
|
+
# conversion for objectType [type = org.killbill.billing.ObjectType]
|
64
|
+
objectType = Java::org.killbill.billing.ObjectType.value_of("#{objectType.to_s}") unless objectType.nil?
|
65
65
|
|
66
|
-
# conversion for auditLevel [type =
|
67
|
-
auditLevel = Java::
|
66
|
+
# conversion for auditLevel [type = org.killbill.billing.util.api.AuditLevel]
|
67
|
+
auditLevel = Java::org.killbill.billing.util.api.AuditLevel.value_of("#{auditLevel.to_s}") unless auditLevel.nil?
|
68
68
|
|
69
|
-
# conversion for context [type =
|
69
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
|
70
70
|
context = context.to_java unless context.nil?
|
71
71
|
res = @real_java_api.get_audit_logs(objectId, objectType, auditLevel, context)
|
72
72
|
# conversion for res [type = java.util.List]
|
73
73
|
tmp = []
|
74
74
|
(res || []).each do |m|
|
75
|
-
# conversion for m [type =
|
75
|
+
# conversion for m [type = org.killbill.billing.util.audit.AuditLog]
|
76
76
|
m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
|
77
77
|
tmp << m
|
78
78
|
end
|
@@ -44,7 +44,7 @@ module Killbill
|
|
44
44
|
|
45
45
|
# conversion for code [type = int]
|
46
46
|
@code = @code
|
47
|
-
Java::
|
47
|
+
Java::org.killbill.billing.BillingExceptionBase.new(@message, @cause, @code)
|
48
48
|
end
|
49
49
|
|
50
50
|
def to_ruby(j_obj)
|
@@ -27,10 +27,10 @@ module Killbill
|
|
27
27
|
module Plugin
|
28
28
|
module Model
|
29
29
|
|
30
|
-
java_package '
|
30
|
+
java_package 'org.killbill.billing.entitlement.api'
|
31
31
|
class Blockable
|
32
32
|
|
33
|
-
include
|
33
|
+
include org.killbill.billing.entitlement.api.Blockable
|
34
34
|
|
35
35
|
attr_accessor :id, :created_date, :updated_date
|
36
36
|
|
@@ -44,7 +44,7 @@ module Killbill
|
|
44
44
|
|
45
45
|
# conversion for code [type = int]
|
46
46
|
@code = @code
|
47
|
-
Java::
|
47
|
+
Java::org.killbill.billing.entitlement.api.BlockingApiException.new(@message, @cause, @code)
|
48
48
|
end
|
49
49
|
|
50
50
|
def to_ruby(j_obj)
|
@@ -27,10 +27,10 @@ module Killbill
|
|
27
27
|
module Plugin
|
28
28
|
module Model
|
29
29
|
|
30
|
-
java_package '
|
30
|
+
java_package 'org.killbill.billing.entitlement.api'
|
31
31
|
class BlockingState
|
32
32
|
|
33
|
-
include
|
33
|
+
include org.killbill.billing.entitlement.api.BlockingState
|
34
34
|
|
35
35
|
attr_accessor :id, :created_date, :updated_date, :blocked_id, :state_name, :type, :effective_date, :is_block_change, :is_block_entitlement, :is_block_billing, :description, :service
|
36
36
|
|
@@ -59,8 +59,8 @@ module Killbill
|
|
59
59
|
# conversion for state_name [type = java.lang.String]
|
60
60
|
@state_name = @state_name.to_s unless @state_name.nil?
|
61
61
|
|
62
|
-
# conversion for type [type =
|
63
|
-
@type = Java::
|
62
|
+
# conversion for type [type = org.killbill.billing.entitlement.api.BlockingStateType]
|
63
|
+
@type = Java::org.killbill.billing.entitlement.api.BlockingStateType.value_of("#{@type.to_s}") unless @type.nil?
|
64
64
|
|
65
65
|
# conversion for effective_date [type = org.joda.time.DateTime]
|
66
66
|
if !@effective_date.nil?
|
@@ -113,7 +113,7 @@ module Killbill
|
|
113
113
|
# conversion for state_name [type = java.lang.String]
|
114
114
|
@state_name = j_obj.state_name
|
115
115
|
|
116
|
-
# conversion for type [type =
|
116
|
+
# conversion for type [type = org.killbill.billing.entitlement.api.BlockingStateType]
|
117
117
|
@type = j_obj.type
|
118
118
|
@type = @type.to_s.to_sym unless @type.nil?
|
119
119
|
|