killbill 1.8.4 → 1.9.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/Jarfile +4 -4
- data/NEWS +4 -1
- data/VERSION +1 -1
- data/gen_config/api.conf +1 -0
- data/lib/killbill/gen/api/account.rb +2 -2
- data/lib/killbill/gen/api/account_audit_logs.rb +303 -0
- data/lib/killbill/gen/api/account_audit_logs_for_object_type.rb +68 -0
- data/lib/killbill/gen/api/account_email.rb +2 -2
- data/lib/killbill/gen/api/audit_log.rb +129 -0
- data/lib/killbill/gen/api/audit_user_api.rb +5 -120
- data/lib/killbill/gen/api/blockable.rb +2 -2
- data/lib/killbill/gen/api/blocking_state.rb +3 -3
- data/lib/killbill/gen/api/call_context.rb +2 -2
- data/lib/killbill/gen/api/control_tag.rb +2 -2
- data/lib/killbill/gen/api/custom_field.rb +2 -2
- data/lib/killbill/gen/api/entitlement.rb +2 -2
- data/lib/killbill/gen/api/entity.rb +2 -2
- data/lib/killbill/gen/api/invoice.rb +2 -2
- data/lib/killbill/gen/api/invoice_formatter.rb +2 -2
- data/lib/killbill/gen/api/invoice_item.rb +2 -2
- data/lib/killbill/gen/api/invoice_item_formatter.rb +2 -2
- data/lib/killbill/gen/api/invoice_payment.rb +3 -3
- data/lib/killbill/gen/api/migration_plan.rb +1 -1
- data/lib/killbill/gen/api/payment.rb +3 -3
- data/lib/killbill/gen/api/payment_api.rb +20 -0
- data/lib/killbill/gen/api/payment_attempt.rb +3 -3
- data/lib/killbill/gen/api/payment_method.rb +2 -2
- data/lib/killbill/gen/api/plan.rb +1 -1
- data/lib/killbill/gen/api/rate.rb +1 -1
- data/lib/killbill/gen/api/refund.rb +3 -3
- data/lib/killbill/gen/api/require_gen.rb +3 -0
- data/lib/killbill/gen/api/rolled_up_usage.rb +2 -2
- data/lib/killbill/gen/api/static_catalog.rb +1 -1
- data/lib/killbill/gen/api/subscription.rb +2 -2
- data/lib/killbill/gen/api/subscription_bundle.rb +3 -3
- data/lib/killbill/gen/api/tag.rb +2 -2
- data/lib/killbill/gen/api/tag_definition.rb +2 -2
- data/lib/killbill/gen/api/tag_user_api.rb +18 -9
- data/lib/killbill/gen/api/tenant.rb +2 -2
- data/lib/killbill/gen/api/tenant_kv.rb +2 -2
- data/lib/killbill/gen/plugin-api/currency_plugin_api.rb +1 -1
- data/lib/killbill/gen/plugin-api/payment_info_plugin.rb +10 -3
- data/lib/killbill/gen/plugin-api/payment_plugin_api.rb +28 -0
- data/lib/killbill/gen/plugin-api/refund_info_plugin.rb +2 -2
- metadata +55 -70
@@ -183,7 +183,7 @@ module Killbill
|
|
183
183
|
# conversion for created_date [type = org.joda.time.DateTime]
|
184
184
|
@created_date = j_obj.created_date
|
185
185
|
if !@created_date.nil?
|
186
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
186
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
187
187
|
str = fmt.print(@created_date)
|
188
188
|
@created_date = DateTime.iso8601(str)
|
189
189
|
end
|
@@ -191,7 +191,7 @@ module Killbill
|
|
191
191
|
# conversion for updated_date [type = org.joda.time.DateTime]
|
192
192
|
@updated_date = j_obj.updated_date
|
193
193
|
if !@updated_date.nil?
|
194
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
194
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
195
195
|
str = fmt.print(@updated_date)
|
196
196
|
@updated_date = DateTime.iso8601(str)
|
197
197
|
end
|
@@ -97,7 +97,7 @@ module Killbill
|
|
97
97
|
# conversion for created_date [type = org.joda.time.DateTime]
|
98
98
|
@created_date = j_obj.created_date
|
99
99
|
if !@created_date.nil?
|
100
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
100
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
101
101
|
str = fmt.print(@created_date)
|
102
102
|
@created_date = DateTime.iso8601(str)
|
103
103
|
end
|
@@ -105,7 +105,7 @@ module Killbill
|
|
105
105
|
# conversion for updated_date [type = org.joda.time.DateTime]
|
106
106
|
@updated_date = j_obj.updated_date
|
107
107
|
if !@updated_date.nil?
|
108
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
108
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
109
109
|
str = fmt.print(@updated_date)
|
110
110
|
@updated_date = DateTime.iso8601(str)
|
111
111
|
end
|
@@ -125,7 +125,7 @@ module Killbill
|
|
125
125
|
# conversion for payment_date [type = org.joda.time.DateTime]
|
126
126
|
@payment_date = j_obj.payment_date
|
127
127
|
if !@payment_date.nil?
|
128
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
128
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
129
129
|
str = fmt.print(@payment_date)
|
130
130
|
@payment_date = DateTime.iso8601(str)
|
131
131
|
end
|
@@ -117,7 +117,7 @@ module Killbill
|
|
117
117
|
@effective_date_for_existing_subscriptons = j_obj.effective_date_for_existing_subscriptons
|
118
118
|
if !@effective_date_for_existing_subscriptons.nil?
|
119
119
|
@effective_date_for_existing_subscriptons = Java::org.joda.time.DateTime.new(@effective_date_for_existing_subscriptons)
|
120
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
120
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
121
121
|
str = fmt.print(@effective_date_for_existing_subscriptons)
|
122
122
|
@effective_date_for_existing_subscriptons = DateTime.iso8601(str)
|
123
123
|
end
|
@@ -113,7 +113,7 @@ module Killbill
|
|
113
113
|
# conversion for created_date [type = org.joda.time.DateTime]
|
114
114
|
@created_date = j_obj.created_date
|
115
115
|
if !@created_date.nil?
|
116
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
116
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
117
117
|
str = fmt.print(@created_date)
|
118
118
|
@created_date = DateTime.iso8601(str)
|
119
119
|
end
|
@@ -121,7 +121,7 @@ module Killbill
|
|
121
121
|
# conversion for updated_date [type = org.joda.time.DateTime]
|
122
122
|
@updated_date = j_obj.updated_date
|
123
123
|
if !@updated_date.nil?
|
124
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
124
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
125
125
|
str = fmt.print(@updated_date)
|
126
126
|
@updated_date = DateTime.iso8601(str)
|
127
127
|
end
|
@@ -152,7 +152,7 @@ module Killbill
|
|
152
152
|
# conversion for effective_date [type = org.joda.time.DateTime]
|
153
153
|
@effective_date = j_obj.effective_date
|
154
154
|
if !@effective_date.nil?
|
155
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
155
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
156
156
|
str = fmt.print(@effective_date)
|
157
157
|
@effective_date = DateTime.iso8601(str)
|
158
158
|
end
|
@@ -338,6 +338,26 @@ module Killbill
|
|
338
338
|
end
|
339
339
|
end
|
340
340
|
|
341
|
+
java_signature 'Java::com.ning.billing.util.entity.Pagination searchPayments(Java::java.lang.String, Java::java.lang.Long, Java::java.lang.Long, Java::com.ning.billing.util.callcontext.TenantContext)'
|
342
|
+
def search_payments(searchKey, offset, limit, context)
|
343
|
+
|
344
|
+
# conversion for searchKey [type = java.lang.String]
|
345
|
+
searchKey = searchKey.to_s unless searchKey.nil?
|
346
|
+
|
347
|
+
# conversion for offset [type = java.lang.Long]
|
348
|
+
offset = offset
|
349
|
+
|
350
|
+
# conversion for limit [type = java.lang.Long]
|
351
|
+
limit = limit
|
352
|
+
|
353
|
+
# conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
|
354
|
+
context = context.to_java unless context.nil?
|
355
|
+
res = @real_java_api.search_payments(searchKey, offset, limit, context)
|
356
|
+
# conversion for res [type = com.ning.billing.util.entity.Pagination]
|
357
|
+
res = Killbill::Plugin::Model::Pagination.new.to_ruby(res) unless res.nil?
|
358
|
+
return res
|
359
|
+
end
|
360
|
+
|
341
361
|
java_signature 'Java::java.util.Set getAvailablePlugins()'
|
342
362
|
def get_available_plugins()
|
343
363
|
res = @real_java_api.get_available_plugins()
|
@@ -78,7 +78,7 @@ module Killbill
|
|
78
78
|
# conversion for created_date [type = org.joda.time.DateTime]
|
79
79
|
@created_date = j_obj.created_date
|
80
80
|
if !@created_date.nil?
|
81
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
81
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
82
82
|
str = fmt.print(@created_date)
|
83
83
|
@created_date = DateTime.iso8601(str)
|
84
84
|
end
|
@@ -86,7 +86,7 @@ module Killbill
|
|
86
86
|
# conversion for updated_date [type = org.joda.time.DateTime]
|
87
87
|
@updated_date = j_obj.updated_date
|
88
88
|
if !@updated_date.nil?
|
89
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
89
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
90
90
|
str = fmt.print(@updated_date)
|
91
91
|
@updated_date = DateTime.iso8601(str)
|
92
92
|
end
|
@@ -94,7 +94,7 @@ module Killbill
|
|
94
94
|
# conversion for effective_date [type = org.joda.time.DateTime]
|
95
95
|
@effective_date = j_obj.effective_date
|
96
96
|
if !@effective_date.nil?
|
97
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
97
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
98
98
|
str = fmt.print(@effective_date)
|
99
99
|
@effective_date = DateTime.iso8601(str)
|
100
100
|
end
|
@@ -75,7 +75,7 @@ module Killbill
|
|
75
75
|
# conversion for created_date [type = org.joda.time.DateTime]
|
76
76
|
@created_date = j_obj.created_date
|
77
77
|
if !@created_date.nil?
|
78
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
78
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
79
79
|
str = fmt.print(@created_date)
|
80
80
|
@created_date = DateTime.iso8601(str)
|
81
81
|
end
|
@@ -83,7 +83,7 @@ module Killbill
|
|
83
83
|
# conversion for updated_date [type = org.joda.time.DateTime]
|
84
84
|
@updated_date = j_obj.updated_date
|
85
85
|
if !@updated_date.nil?
|
86
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
86
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
87
87
|
str = fmt.print(@updated_date)
|
88
88
|
@updated_date = DateTime.iso8601(str)
|
89
89
|
end
|
@@ -117,7 +117,7 @@ module Killbill
|
|
117
117
|
@effective_date_for_existing_subscriptons = j_obj.effective_date_for_existing_subscriptons
|
118
118
|
if !@effective_date_for_existing_subscriptons.nil?
|
119
119
|
@effective_date_for_existing_subscriptons = Java::org.joda.time.DateTime.new(@effective_date_for_existing_subscriptons)
|
120
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
120
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
121
121
|
str = fmt.print(@effective_date_for_existing_subscriptons)
|
122
122
|
@effective_date_for_existing_subscriptons = DateTime.iso8601(str)
|
123
123
|
end
|
@@ -75,7 +75,7 @@ module Killbill
|
|
75
75
|
# conversion for conversion_date [type = org.joda.time.DateTime]
|
76
76
|
@conversion_date = j_obj.conversion_date
|
77
77
|
if !@conversion_date.nil?
|
78
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
78
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
79
79
|
str = fmt.print(@conversion_date)
|
80
80
|
@conversion_date = DateTime.iso8601(str)
|
81
81
|
end
|
@@ -91,7 +91,7 @@ module Killbill
|
|
91
91
|
# conversion for created_date [type = org.joda.time.DateTime]
|
92
92
|
@created_date = j_obj.created_date
|
93
93
|
if !@created_date.nil?
|
94
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
94
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
95
95
|
str = fmt.print(@created_date)
|
96
96
|
@created_date = DateTime.iso8601(str)
|
97
97
|
end
|
@@ -99,7 +99,7 @@ module Killbill
|
|
99
99
|
# conversion for updated_date [type = org.joda.time.DateTime]
|
100
100
|
@updated_date = j_obj.updated_date
|
101
101
|
if !@updated_date.nil?
|
102
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
102
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
103
103
|
str = fmt.print(@updated_date)
|
104
104
|
@updated_date = DateTime.iso8601(str)
|
105
105
|
end
|
@@ -128,7 +128,7 @@ module Killbill
|
|
128
128
|
# conversion for effective_date [type = org.joda.time.DateTime]
|
129
129
|
@effective_date = j_obj.effective_date
|
130
130
|
if !@effective_date.nil?
|
131
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
131
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
132
132
|
str = fmt.print(@effective_date)
|
133
133
|
@effective_date = DateTime.iso8601(str)
|
134
134
|
end
|
@@ -106,6 +106,9 @@ require 'killbill/gen/api/record_id_api'
|
|
106
106
|
require 'killbill/gen/api/tag_api_exception'
|
107
107
|
require 'killbill/gen/api/tag_definition_api_exception'
|
108
108
|
require 'killbill/gen/api/tag_user_api'
|
109
|
+
require 'killbill/gen/api/account_audit_logs'
|
110
|
+
require 'killbill/gen/api/account_audit_logs_for_object_type'
|
111
|
+
require 'killbill/gen/api/audit_log'
|
109
112
|
require 'killbill/gen/api/call_context'
|
110
113
|
require 'killbill/gen/api/tenant_context'
|
111
114
|
require 'killbill/gen/api/custom_field'
|
@@ -76,7 +76,7 @@ module Killbill
|
|
76
76
|
# conversion for start_time [type = org.joda.time.DateTime]
|
77
77
|
@start_time = j_obj.start_time
|
78
78
|
if !@start_time.nil?
|
79
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
79
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
80
80
|
str = fmt.print(@start_time)
|
81
81
|
@start_time = DateTime.iso8601(str)
|
82
82
|
end
|
@@ -84,7 +84,7 @@ module Killbill
|
|
84
84
|
# conversion for end_time [type = org.joda.time.DateTime]
|
85
85
|
@end_time = j_obj.end_time
|
86
86
|
if !@end_time.nil?
|
87
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
87
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
88
88
|
str = fmt.print(@end_time)
|
89
89
|
@end_time = DateTime.iso8601(str)
|
90
90
|
end
|
@@ -88,7 +88,7 @@ module Killbill
|
|
88
88
|
@effective_date = j_obj.effective_date
|
89
89
|
if !@effective_date.nil?
|
90
90
|
@effective_date = Java::org.joda.time.DateTime.new(@effective_date)
|
91
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
91
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
92
92
|
str = fmt.print(@effective_date)
|
93
93
|
@effective_date = DateTime.iso8601(str)
|
94
94
|
end
|
@@ -179,7 +179,7 @@ module Killbill
|
|
179
179
|
# conversion for created_date [type = org.joda.time.DateTime]
|
180
180
|
@created_date = j_obj.created_date
|
181
181
|
if !@created_date.nil?
|
182
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
182
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
183
183
|
str = fmt.print(@created_date)
|
184
184
|
@created_date = DateTime.iso8601(str)
|
185
185
|
end
|
@@ -187,7 +187,7 @@ module Killbill
|
|
187
187
|
# conversion for updated_date [type = org.joda.time.DateTime]
|
188
188
|
@updated_date = j_obj.updated_date
|
189
189
|
if !@updated_date.nil?
|
190
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
190
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
191
191
|
str = fmt.print(@updated_date)
|
192
192
|
@updated_date = DateTime.iso8601(str)
|
193
193
|
end
|
@@ -87,7 +87,7 @@ module Killbill
|
|
87
87
|
# conversion for created_date [type = org.joda.time.DateTime]
|
88
88
|
@created_date = j_obj.created_date
|
89
89
|
if !@created_date.nil?
|
90
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
90
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
91
91
|
str = fmt.print(@created_date)
|
92
92
|
@created_date = DateTime.iso8601(str)
|
93
93
|
end
|
@@ -95,7 +95,7 @@ module Killbill
|
|
95
95
|
# conversion for updated_date [type = org.joda.time.DateTime]
|
96
96
|
@updated_date = j_obj.updated_date
|
97
97
|
if !@updated_date.nil?
|
98
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
98
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
99
99
|
str = fmt.print(@updated_date)
|
100
100
|
@updated_date = DateTime.iso8601(str)
|
101
101
|
end
|
@@ -110,7 +110,7 @@ module Killbill
|
|
110
110
|
# conversion for original_created_date [type = org.joda.time.DateTime]
|
111
111
|
@original_created_date = j_obj.original_created_date
|
112
112
|
if !@original_created_date.nil?
|
113
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
113
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
114
114
|
str = fmt.print(@original_created_date)
|
115
115
|
@original_created_date = DateTime.iso8601(str)
|
116
116
|
end
|
data/lib/killbill/gen/api/tag.rb
CHANGED
@@ -72,7 +72,7 @@ module Killbill
|
|
72
72
|
# conversion for created_date [type = org.joda.time.DateTime]
|
73
73
|
@created_date = j_obj.created_date
|
74
74
|
if !@created_date.nil?
|
75
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
75
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
76
76
|
str = fmt.print(@created_date)
|
77
77
|
@created_date = DateTime.iso8601(str)
|
78
78
|
end
|
@@ -80,7 +80,7 @@ module Killbill
|
|
80
80
|
# conversion for updated_date [type = org.joda.time.DateTime]
|
81
81
|
@updated_date = j_obj.updated_date
|
82
82
|
if !@updated_date.nil?
|
83
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
83
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
84
84
|
str = fmt.print(@updated_date)
|
85
85
|
@updated_date = DateTime.iso8601(str)
|
86
86
|
end
|
@@ -81,7 +81,7 @@ module Killbill
|
|
81
81
|
# conversion for created_date [type = org.joda.time.DateTime]
|
82
82
|
@created_date = j_obj.created_date
|
83
83
|
if !@created_date.nil?
|
84
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
84
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
85
85
|
str = fmt.print(@created_date)
|
86
86
|
@created_date = DateTime.iso8601(str)
|
87
87
|
end
|
@@ -89,7 +89,7 @@ module Killbill
|
|
89
89
|
# conversion for updated_date [type = org.joda.time.DateTime]
|
90
90
|
@updated_date = j_obj.updated_date
|
91
91
|
if !@updated_date.nil?
|
92
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
92
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
93
93
|
str = fmt.print(@updated_date)
|
94
94
|
@updated_date = DateTime.iso8601(str)
|
95
95
|
end
|
@@ -202,8 +202,8 @@ module Killbill
|
|
202
202
|
@real_java_api.remove_tag(objectId, objectType, tagDefinitionId, context)
|
203
203
|
end
|
204
204
|
|
205
|
-
java_signature 'Java::java.util.List getTagsForObject(Java::java.util.UUID, Java::com.ning.billing.ObjectType, Java::com.ning.billing.util.callcontext.TenantContext)'
|
206
|
-
def get_tags_for_object(objectId, objectType, context)
|
205
|
+
java_signature 'Java::java.util.List getTagsForObject(Java::java.util.UUID, Java::com.ning.billing.ObjectType, Java::boolean, Java::com.ning.billing.util.callcontext.TenantContext)'
|
206
|
+
def get_tags_for_object(objectId, objectType, includedDeleted, context)
|
207
207
|
|
208
208
|
# conversion for objectId [type = java.util.UUID]
|
209
209
|
objectId = java.util.UUID.fromString(objectId.to_s) unless objectId.nil?
|
@@ -211,9 +211,12 @@ module Killbill
|
|
211
211
|
# conversion for objectType [type = com.ning.billing.ObjectType]
|
212
212
|
objectType = Java::com.ning.billing.ObjectType.value_of("#{objectType.to_s}") unless objectType.nil?
|
213
213
|
|
214
|
+
# conversion for includedDeleted [type = boolean]
|
215
|
+
includedDeleted = includedDeleted.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(includedDeleted)
|
216
|
+
|
214
217
|
# conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
|
215
218
|
context = context.to_java unless context.nil?
|
216
|
-
res = @real_java_api.get_tags_for_object(objectId, objectType, context)
|
219
|
+
res = @real_java_api.get_tags_for_object(objectId, objectType, includedDeleted, context)
|
217
220
|
# conversion for res [type = java.util.List]
|
218
221
|
tmp = []
|
219
222
|
(res || []).each do |m|
|
@@ -225,8 +228,8 @@ module Killbill
|
|
225
228
|
return res
|
226
229
|
end
|
227
230
|
|
228
|
-
java_signature 'Java::java.util.List getTagsForAccountType(Java::java.util.UUID, Java::com.ning.billing.ObjectType, Java::com.ning.billing.util.callcontext.TenantContext)'
|
229
|
-
def get_tags_for_account_type(accountId, objectType, context)
|
231
|
+
java_signature 'Java::java.util.List getTagsForAccountType(Java::java.util.UUID, Java::com.ning.billing.ObjectType, Java::boolean, Java::com.ning.billing.util.callcontext.TenantContext)'
|
232
|
+
def get_tags_for_account_type(accountId, objectType, includedDeleted, context)
|
230
233
|
|
231
234
|
# conversion for accountId [type = java.util.UUID]
|
232
235
|
accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
|
@@ -234,9 +237,12 @@ module Killbill
|
|
234
237
|
# conversion for objectType [type = com.ning.billing.ObjectType]
|
235
238
|
objectType = Java::com.ning.billing.ObjectType.value_of("#{objectType.to_s}") unless objectType.nil?
|
236
239
|
|
240
|
+
# conversion for includedDeleted [type = boolean]
|
241
|
+
includedDeleted = includedDeleted.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(includedDeleted)
|
242
|
+
|
237
243
|
# conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
|
238
244
|
context = context.to_java unless context.nil?
|
239
|
-
res = @real_java_api.get_tags_for_account_type(accountId, objectType, context)
|
245
|
+
res = @real_java_api.get_tags_for_account_type(accountId, objectType, includedDeleted, context)
|
240
246
|
# conversion for res [type = java.util.List]
|
241
247
|
tmp = []
|
242
248
|
(res || []).each do |m|
|
@@ -248,15 +254,18 @@ module Killbill
|
|
248
254
|
return res
|
249
255
|
end
|
250
256
|
|
251
|
-
java_signature 'Java::java.util.List getTagsForAccount(Java::java.util.UUID, Java::com.ning.billing.util.callcontext.TenantContext)'
|
252
|
-
def get_tags_for_account(accountId, context)
|
257
|
+
java_signature 'Java::java.util.List getTagsForAccount(Java::java.util.UUID, Java::boolean, Java::com.ning.billing.util.callcontext.TenantContext)'
|
258
|
+
def get_tags_for_account(accountId, includedDeleted, context)
|
253
259
|
|
254
260
|
# conversion for accountId [type = java.util.UUID]
|
255
261
|
accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
|
256
262
|
|
263
|
+
# conversion for includedDeleted [type = boolean]
|
264
|
+
includedDeleted = includedDeleted.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(includedDeleted)
|
265
|
+
|
257
266
|
# conversion for context [type = com.ning.billing.util.callcontext.TenantContext]
|
258
267
|
context = context.to_java unless context.nil?
|
259
|
-
res = @real_java_api.get_tags_for_account(accountId, context)
|
268
|
+
res = @real_java_api.get_tags_for_account(accountId, includedDeleted, context)
|
260
269
|
# conversion for res [type = java.util.List]
|
261
270
|
tmp = []
|
262
271
|
(res || []).each do |m|
|
@@ -72,7 +72,7 @@ module Killbill
|
|
72
72
|
# conversion for created_date [type = org.joda.time.DateTime]
|
73
73
|
@created_date = j_obj.created_date
|
74
74
|
if !@created_date.nil?
|
75
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
75
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
76
76
|
str = fmt.print(@created_date)
|
77
77
|
@created_date = DateTime.iso8601(str)
|
78
78
|
end
|
@@ -80,7 +80,7 @@ module Killbill
|
|
80
80
|
# conversion for updated_date [type = org.joda.time.DateTime]
|
81
81
|
@updated_date = j_obj.updated_date
|
82
82
|
if !@updated_date.nil?
|
83
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
83
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
84
84
|
str = fmt.print(@updated_date)
|
85
85
|
@updated_date = DateTime.iso8601(str)
|
86
86
|
end
|
@@ -69,7 +69,7 @@ module Killbill
|
|
69
69
|
# conversion for created_date [type = org.joda.time.DateTime]
|
70
70
|
@created_date = j_obj.created_date
|
71
71
|
if !@created_date.nil?
|
72
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
72
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
73
73
|
str = fmt.print(@created_date)
|
74
74
|
@created_date = DateTime.iso8601(str)
|
75
75
|
end
|
@@ -77,7 +77,7 @@ module Killbill
|
|
77
77
|
# conversion for updated_date [type = org.joda.time.DateTime]
|
78
78
|
@updated_date = j_obj.updated_date
|
79
79
|
if !@updated_date.nil?
|
80
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
80
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
81
81
|
str = fmt.print(@updated_date)
|
82
82
|
@updated_date = DateTime.iso8601(str)
|
83
83
|
end
|
@@ -154,7 +154,7 @@ module Killbill
|
|
154
154
|
|
155
155
|
# conversion for conversionDate [type = org.joda.time.DateTime]
|
156
156
|
if !conversionDate.nil?
|
157
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
157
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
158
158
|
str = fmt.print(conversionDate)
|
159
159
|
conversionDate = DateTime.iso8601(str)
|
160
160
|
end
|
@@ -32,12 +32,15 @@ module Killbill
|
|
32
32
|
|
33
33
|
include com.ning.billing.payment.plugin.api.PaymentInfoPlugin
|
34
34
|
|
35
|
-
attr_accessor :amount, :currency, :created_date, :effective_date, :status, :gateway_error, :gateway_error_code, :first_payment_reference_id, :second_payment_reference_id
|
35
|
+
attr_accessor :kb_payment_id, :amount, :currency, :created_date, :effective_date, :status, :gateway_error, :gateway_error_code, :first_payment_reference_id, :second_payment_reference_id
|
36
36
|
|
37
37
|
def initialize()
|
38
38
|
end
|
39
39
|
|
40
40
|
def to_java()
|
41
|
+
# conversion for kb_payment_id [type = java.util.UUID]
|
42
|
+
@kb_payment_id = java.util.UUID.fromString(@kb_payment_id.to_s) unless @kb_payment_id.nil?
|
43
|
+
|
41
44
|
# conversion for amount [type = java.math.BigDecimal]
|
42
45
|
if @amount.nil?
|
43
46
|
@amount = java.math.BigDecimal::ZERO
|
@@ -78,6 +81,10 @@ module Killbill
|
|
78
81
|
end
|
79
82
|
|
80
83
|
def to_ruby(j_obj)
|
84
|
+
# conversion for kb_payment_id [type = java.util.UUID]
|
85
|
+
@kb_payment_id = j_obj.kb_payment_id
|
86
|
+
@kb_payment_id = @kb_payment_id.nil? ? nil : @kb_payment_id.to_s
|
87
|
+
|
81
88
|
# conversion for amount [type = java.math.BigDecimal]
|
82
89
|
@amount = j_obj.amount
|
83
90
|
@amount = @amount.nil? ? 0 : BigDecimal.new(@amount.to_s)
|
@@ -89,7 +96,7 @@ module Killbill
|
|
89
96
|
# conversion for created_date [type = org.joda.time.DateTime]
|
90
97
|
@created_date = j_obj.created_date
|
91
98
|
if !@created_date.nil?
|
92
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
99
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
93
100
|
str = fmt.print(@created_date)
|
94
101
|
@created_date = DateTime.iso8601(str)
|
95
102
|
end
|
@@ -97,7 +104,7 @@ module Killbill
|
|
97
104
|
# conversion for effective_date [type = org.joda.time.DateTime]
|
98
105
|
@effective_date = j_obj.effective_date
|
99
106
|
if !@effective_date.nil?
|
100
|
-
fmt = Java::org.joda.time.format.ISODateTimeFormat.
|
107
|
+
fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
|
101
108
|
str = fmt.print(@effective_date)
|
102
109
|
@effective_date = DateTime.iso8601(str)
|
103
110
|
end
|