killbill 8.3.6 → 9.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (69) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +51 -0
  3. data/Gemfile.lock +4 -4
  4. data/Jarfile +11 -11
  5. data/Jarfile.lock +63 -57
  6. data/NEWS +2 -8
  7. data/README.md +1 -0
  8. data/gen_config/api.conf +2 -0
  9. data/lib/killbill/gen/api/account.rb +20 -20
  10. data/lib/killbill/gen/api/account_data.rb +15 -1
  11. data/lib/killbill/gen/api/block_price_override.rb +81 -0
  12. data/lib/killbill/gen/api/call_context.rb +8 -1
  13. data/lib/killbill/gen/api/catalog_entity.rb +7 -1
  14. data/lib/killbill/gen/api/catalog_user_api.rb +8 -0
  15. data/lib/killbill/gen/api/custom_field_user_api.rb +17 -0
  16. data/lib/killbill/gen/api/email_notification.rb +75 -0
  17. data/lib/killbill/gen/api/entitlement_api.rb +12 -6
  18. data/lib/killbill/gen/api/immutable_account_data.rb +1 -20
  19. data/lib/killbill/gen/api/invoice.rb +15 -1
  20. data/lib/killbill/gen/api/invoice_formatter.rb +15 -1
  21. data/lib/killbill/gen/api/invoice_item.rb +19 -1
  22. data/lib/killbill/gen/api/invoice_item_formatter.rb +19 -1
  23. data/lib/killbill/gen/api/migration_plan.rb +14 -1
  24. data/lib/killbill/gen/api/mutable_account_data.rb +15 -1
  25. data/lib/killbill/gen/api/mutable_static_catalog.rb +1 -8
  26. data/lib/killbill/gen/api/osgi_killbill.rb +8 -1
  27. data/lib/killbill/gen/api/overdue_api.rb +88 -0
  28. data/lib/killbill/gen/api/overdue_api_exception.rb +68 -0
  29. data/lib/killbill/gen/api/overdue_condition.rb +108 -0
  30. data/lib/killbill/gen/api/overdue_config.rb +58 -0
  31. data/lib/killbill/gen/api/overdue_state.rb +120 -0
  32. data/lib/killbill/gen/api/overdue_states_account.rb +72 -0
  33. data/lib/killbill/gen/api/payment_api.rb +192 -51
  34. data/lib/killbill/gen/api/plan.rb +14 -1
  35. data/lib/killbill/gen/api/plan_phase.rb +7 -1
  36. data/lib/killbill/gen/api/plan_phase_price_override.rb +20 -1
  37. data/lib/killbill/gen/api/price_list.rb +7 -1
  38. data/lib/killbill/gen/api/product.rb +7 -1
  39. data/lib/killbill/gen/api/require_gen.rb +131 -121
  40. data/lib/killbill/gen/api/security_api.rb +20 -0
  41. data/lib/killbill/gen/api/static_catalog.rb +1 -8
  42. data/lib/killbill/gen/api/tag_user_api.rb +12 -3
  43. data/lib/killbill/gen/api/tenant_context.rb +8 -1
  44. data/lib/killbill/gen/api/tier_price_override.rb +70 -0
  45. data/lib/killbill/gen/api/tiered_block_price_override.rb +87 -0
  46. data/lib/killbill/gen/api/unit.rb +7 -1
  47. data/lib/killbill/gen/api/usage.rb +14 -1
  48. data/lib/killbill/gen/api/usage_price_override.rb +83 -0
  49. data/lib/killbill/gen/plugin-api/catalog_plugin_api.rb +34 -0
  50. data/lib/killbill/gen/plugin-api/entitlement_context.rb +8 -8
  51. data/lib/killbill/gen/plugin-api/ext_bus_event.rb +8 -1
  52. data/lib/killbill/gen/plugin-api/invoice_payment_metadata.rb +115 -0
  53. data/lib/killbill/gen/plugin-api/invoice_plugin_api_retry_exception.rb +64 -0
  54. data/lib/killbill/gen/plugin-api/notification_plugin_api_retry_exception.rb +64 -0
  55. data/lib/killbill/gen/plugin-api/payment_control_context.rb +14 -8
  56. data/lib/killbill/gen/plugin-api/prior_payment_control_result.rb +7 -1
  57. data/lib/killbill/gen/plugin-api/require_gen.rb +15 -12
  58. data/lib/killbill/gen/plugin-api/subscription_metadata.rb +8 -2
  59. data/lib/killbill/gen/plugin-api/versioned_plugin_catalog.rb +1 -8
  60. data/lib/killbill/helpers/active_merchant/active_record/models/response.rb +6 -21
  61. data/lib/killbill/helpers/active_merchant/killbill_spec_helper.rb +1 -1
  62. data/lib/killbill/helpers/active_merchant/payment_plugin.rb +12 -12
  63. data/lib/killbill/version.rb +1 -1
  64. data/spec/killbill/helpers/response_spec.rb +0 -7
  65. data/spec/killbill/helpers/test_response.rb +0 -4
  66. data/spec/killbill/killbillapi_spec.rb +1 -0
  67. metadata +17 -4
  68. data/.circleci/config.yml +0 -138
  69. data/lib/killbill/gen/api/refund.rb +0 -151
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 71f7c71049d2c24991a8bfa9c1bee30d15730c2e
4
- data.tar.gz: 04c231f3acf948fcb22cd5964c71b6456900b79f
3
+ metadata.gz: 5d578e1ef04688003c404427d1164c71a0b26a22
4
+ data.tar.gz: 5fe18a0b545bb73a4131c2b212bd7eb958733633
5
5
  SHA512:
6
- metadata.gz: 679de5fda1444f765e2855ab7a27b91ac41ff8370bb368896ffa6a25cc51eb7046d7fdc054bf0512fb49c1d80b86c883c7f562a88ee8f0a0dbb947234570bc82
7
- data.tar.gz: 36918fd0773de1c854914902444269ac9e958ca0afb199b497b1b27c6822555c5d8232a0099f2f81aadb58bb7c0ccf85c43b00acfb1cc5412624a8eadf0464ee
6
+ metadata.gz: b9b47a64148b0c4f2532768871ae6bed3ba721787e438cdfee116c9ea1d82b6e293624bcf77f638f5c794dd4d49450ef27e8533fafd7ba5fdad49a0767f66f03
7
+ data.tar.gz: 97ca3b6290e95f3a686f5cc59ae7f97b444747dc6aed3e001f62ce740868ff0a3ff57a401343120805a586459d269e496ac6cf2e595791ca0c670a11fd2a74f0
data/.travis.yml ADDED
@@ -0,0 +1,51 @@
1
+ language: ruby
2
+
3
+ sudo: false
4
+ cache:
5
+ bundler: true
6
+ directories:
7
+ - $HOME/.m2
8
+
9
+ services:
10
+ - mysql
11
+ - postgresql
12
+
13
+ before_script:
14
+ - bundle exec jbundle install
15
+ - mysql -uroot -e 'create database killbill_test;'
16
+ - psql -c 'create database killbill_test;' -U postgres
17
+
18
+ notifications:
19
+ email:
20
+ - kill-bill-commits@googlegroups.com
21
+
22
+ env:
23
+ global:
24
+ - JRUBY_OPTS='-J-Xmx1024M'
25
+ matrix:
26
+ # Need MySQL 5.6 - see https://github.com/travis-ci/travis-ci/issues/1986
27
+ #- AR_ADAPTER='mariadb' AR_USERNAME='root' AR_PASSWORD='' AR_DATABASE='killbill_test'
28
+ - AR_ADAPTER='postgresql' AR_USERNAME='postgres' AR_DATABASE='killbill_test'
29
+ - AR_ADAPTER='sqlite3' AR_DATABASE='test.db'
30
+
31
+ rvm:
32
+ - jruby-1.7.20
33
+ - jruby-20mode # latest 1.7.x
34
+ - jruby-head
35
+
36
+ gemfile:
37
+ - Gemfile
38
+ - Gemfile.head
39
+
40
+ jdk:
41
+ - openjdk7
42
+ - oraclejdk7
43
+ - oraclejdk8
44
+
45
+ matrix:
46
+ allow_failures:
47
+ - rvm: jruby-head
48
+ - rvm: jruby-20mode # Gemfile.lock bug with --deployment?
49
+ - jdk: oraclejdk8
50
+ - gemfile: Gemfile.head
51
+ fast_finish: true
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- killbill (8.3.6)
4
+ killbill (9.2.0)
5
5
  rack (>= 1.5.2)
6
6
  sinatra (~> 1.3.4)
7
7
  typhoeus (~> 0.6.9)
@@ -56,9 +56,9 @@ GEM
56
56
  diff-lcs (1.1.3)
57
57
  equalizer (0.0.11)
58
58
  erubis (2.7.0)
59
- ethon (0.9.1)
59
+ ethon (0.10.1)
60
60
  ffi (>= 1.3.0)
61
- ffi (1.9.14-java)
61
+ ffi (1.9.18-java)
62
62
  i18n (0.7.0)
63
63
  ice_nine (0.11.2)
64
64
  jar-dependencies (0.3.5)
@@ -145,4 +145,4 @@ DEPENDENCIES
145
145
  thread_safe (~> 0.3.4)
146
146
 
147
147
  BUNDLED WITH
148
- 1.11.2
148
+ 1.13.7
data/Jarfile CHANGED
@@ -1,12 +1,12 @@
1
- jar 'org.kill-bill.billing:killbill-api', '0.50'
2
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.23'
3
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.23'
4
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.23'
5
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.23'
6
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.23'
7
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.23'
8
- jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.23'
9
- jar 'org.kill-bill.billing:killbill-util:tests', '0.18.0'
10
- jar 'org.kill-bill.billing:killbill-util', '0.18.0'
1
+ jar 'org.kill-bill.billing:killbill-api', '0.51.7'
2
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.24.4'
3
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.24.4'
4
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.24.4'
5
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.24.4'
6
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.24.4'
7
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.24.4'
8
+ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.24.4'
9
+ jar 'org.kill-bill.billing:killbill-util:tests', '0.19.0'
10
+ jar 'org.kill-bill.billing:killbill-util', '0.19.0'
11
11
  jar 'org.mockito:mockito-all', '1.10.19'
12
- jar 'javax.servlet:javax.servlet-api', '3.1.0'
12
+ jar 'javax.servlet:javax.servlet-api', '4.0.0'
data/Jarfile.lock CHANGED
@@ -1,64 +1,70 @@
1
1
  ---
2
2
  :runtime:
3
- - io.dropwizard.metrics:metrics-core:jar:3.1.1
4
- - joda-time:joda-time:jar:2.3
5
- - org.weakref:jmxutils:jar:1.18
6
- - commons-beanutils:commons-beanutils:jar:1.8.3
7
- - com.google.inject:guice:jar:3.0
3
+ - com.zaxxer:HikariCP-java6:jar:2.3.13
4
+ - org.kill-bill.billing:killbill-internal-api:jar:0.19.0
5
+ - net.jcip:jcip-annotations:jar:1.0
6
+ - com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.6.7
7
+ - org.skife.config:config-magic:jar:0.17
8
+ - org.weakref:jmxutils:jar:1.19
9
+ - aopalliance:aopalliance:jar:1.0
10
+ - org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.24.4
8
11
  - org.osgi:org.osgi.core:jar:5.0.0
9
- - com.fasterxml.jackson.core:jackson-databind:jar:2.4.5
10
- - org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.23
11
- - org.kill-bill.billing:killbill-platform-api:jar:0.36.1
12
+ - com.ning:async-http-client:jar:1.9.40
13
+ - org.kill-bill.commons:killbill-concurrent:jar:0.21.1
14
+ - org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.24.4
15
+ - org.kill-bill.billing:killbill-platform-osgi:jar:0.37.2
16
+ - org.kill-bill.billing:killbill-platform-lifecycle:jar:0.37.2
17
+ - org.kill-bill.commons:killbill-embeddeddb-common:jar:0.21.1
18
+ - org.joda:joda-money:jar:0.9
19
+ - org.ehcache.integrations.shiro:shiro-ehcache3:jar:1.0.0
20
+ - com.fasterxml.jackson.dataformat:jackson-dataformat-smile:jar:2.6.7
21
+ - com.fasterxml:classmate:jar:1.1.0
22
+ - org.slf4j:jcl-over-slf4j:jar:1.7.25
23
+ - com.google.inject:guice:jar:3.0
24
+ - io.netty:netty:jar:3.10.6.Final
25
+ - org.apache.felix:org.apache.felix.framework:jar:4.4.1
26
+ - org.ehcache:ehcache-clustered:jar:3.3.1
27
+ - com.google.code.findbugs:jsr305:jar:3.0.1
28
+ - org.kill-bill.commons:killbill-locker:jar:0.21.1
29
+ - org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.24.4
30
+ - com.google.guava:guava:jar:20.0
12
31
  - com.samskivert:jmustache:jar:1.5
13
- - org.kill-bill.commons:killbill-clock:jar:0.20
14
- - org.kill-bill.billing:killbill-util:jar:0.18.0
15
- - com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.5
16
- - org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.23
32
+ - org.kill-bill.commons:killbill-xmlloader:jar:0.21.1
33
+ - javax.cache:cache-api:jar:1.0.0
34
+ - org.kill-bill.billing:killbill-util:jar:tests:0.19.0
17
35
  - org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
18
- - com.h2database:h2:jar:1.4.186
19
- - com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.5
20
- - javax.activation:activation:jar:1.1
21
- - org.javassist:javassist:jar:3.19.0-GA
22
- - org.skife.config:config-magic:jar:0.14
23
- - org.apache.commons:commons-email:jar:1.2
36
+ - org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.24.4
37
+ - javax.servlet:javax.servlet-api:jar:4.0.0
38
+ - com.fasterxml.jackson.core:jackson-annotations:jar:2.6.7
39
+ - org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.24.4
40
+ - org.apache.shiro:shiro-core:jar:1.3.2
41
+ - org.ow2.asm:asm:jar:5.0.3
42
+ - com.fasterxml.jackson.core:jackson-databind:jar:2.6.7
43
+ - org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.24.4
44
+ - org.kill-bill.billing:killbill-platform-api:jar:0.37.2
45
+ - com.google.code.findbugs:annotations:jar:3.0.1u2
46
+ - org.kill-bill.billing:killbill-platform-osgi-api:jar:0.37.2
47
+ - org.antlr:ST4:jar:4.0.8
48
+ - org.kill-bill.commons:killbill-queue:jar:0.21.1
49
+ - org.apache.shiro:shiro-guice:jar:1.3.2
50
+ - org.antlr:antlr-runtime:jar:3.5.2
51
+ - org.kill-bill.commons:killbill-jdbi:jar:0.21.1
52
+ - org.ehcache:ehcache:jar:3.3.1
53
+ - io.dropwizard.metrics:metrics-jcache:jar:3.2.2
54
+ - org.kill-bill.billing:killbill-api:jar:0.51.7
55
+ - org.kill-bill.commons:killbill-clock:jar:0.21.1
56
+ - com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.6.7
57
+ - com.google.inject.extensions:guice-multibindings:jar:3.0
58
+ - joda-time:joda-time:jar:2.9.9
59
+ - javax.inject:javax.inject:jar:1
60
+ - org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.24.4
61
+ - com.h2database:h2:jar:1.4.194
62
+ - commons-beanutils:commons-beanutils:jar:1.8.3
63
+ - com.fasterxml.jackson.core:jackson-core:jar:2.6.7
64
+ - cglib:cglib:jar:3.1
65
+ - io.dropwizard.metrics:metrics-core:jar:3.2.2
66
+ - org.slf4j:slf4j-api:jar:1.7.25
67
+ - org.kill-bill.billing:killbill-util:jar:0.19.0
24
68
  - org.mockito:mockito-all:jar:1.10.19
25
- - antlr:antlr:jar:2.7.7
26
- - aopalliance:aopalliance:jar:1.0
27
- - com.zaxxer:HikariCP-java6:jar:2.3.7
28
- - org.slf4j:slf4j-api:jar:1.7.21
29
- - com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
30
- - org.antlr:stringtemplate:jar:3.2.1
31
- - org.slf4j:jcl-over-slf4j:jar:1.7.21
32
- - javax.mail:mail:jar:1.4.1
33
- - io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
34
- - org.jdbi:jdbi:jar:2.62
35
- - com.fasterxml.jackson.core:jackson-core:jar:2.4.5
36
- - org.apache.felix:org.apache.felix.framework:jar:4.4.1
37
- - org.joda:joda-money:jar:0.9
38
- - org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.23
39
- - org.apache.shiro:shiro-core:jar:1.2.3
40
- - org.kill-bill.billing:killbill-internal-api:jar:0.18.0
41
- - org.kill-bill.billing:killbill-util:jar:tests:0.18.0
42
- - org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.23
43
- - org.kill-bill.commons:killbill-jdbi:jar:0.20
44
- - com.google.guava:guava:jar:r09
45
- - org.kill-bill.commons:killbill-queue:jar:0.20
69
+ - org.kill-bill.billing:killbill-platform-base:jar:0.37.2
46
70
  - org.osgi:org.osgi.compendium:jar:5.0.0
47
- - org.kill-bill.commons:killbill-xmlloader:jar:0.20
48
- - javax.servlet:javax.servlet-api:jar:3.1.0
49
- - org.kill-bill.billing:killbill-platform-osgi:jar:0.36.1
50
- - org.kill-bill.billing:killbill-platform-base:jar:0.36.1
51
- - org.apache.shiro:shiro-ehcache:jar:1.2.3
52
- - javax.inject:javax.inject:jar:1
53
- - org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.23
54
- - org.kill-bill.billing:killbill-api:jar:0.50
55
- - org.kill-bill.billing:killbill-platform-osgi-api:jar:0.36.1
56
- - com.google.inject.extensions:guice-multibindings:jar:3.0
57
- - net.sf.ehcache:ehcache:jar:2.9.1
58
- - org.kill-bill.commons:killbill-locker:jar:0.20
59
- - org.kill-bill.commons:killbill-embeddeddb-common:jar:0.20
60
- - org.apache.shiro:shiro-guice:jar:1.2.3
61
- - com.google.code.findbugs:annotations:jar:3.0.0
62
- - org.kill-bill.commons:killbill-concurrent:jar:0.20
63
- - org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.23
64
- - org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.23
data/NEWS CHANGED
@@ -1,11 +1,5 @@
1
- 8.3.5
2
- ActiveMerchant: add utility function to avoid persisting sensitive data (GDPR)
3
-
4
- 8.3.4
5
- ActiveMerchant: pass in extra_params to gateway api calls
6
-
7
- 8.3.3
8
- active_merchant: update default CC year in tests
1
+ 9.2.0
2
+ Initial release for Kill Bill 0.19.x
9
3
 
10
4
  8.3.2
11
5
  Merge global configuration into each account specific configuration
data/README.md CHANGED
@@ -20,6 +20,7 @@ Kill Bill compatibility
20
20
  | ----------------: | ----------------: |
21
21
  | 7.x.y | 0.16.z |
22
22
  | 8.x.y | 0.18.z |
23
+ | 9.x.y | 0.20.z |
23
24
 
24
25
 
25
26
  How to write a Notification plugin
data/gen_config/api.conf CHANGED
@@ -23,6 +23,8 @@ org.killbill.billing.junction.api, \
23
23
  org.killbill.billing.osgi, \
24
24
  org.killbill.billing.osgi.api, \
25
25
  org.killbill.billing.osgi.api.config, \
26
+ org.killbill.billing.overdue, \
27
+ org.killbill.billing.overdue.api, \
26
28
  org.killbill.billing.payment, \
27
29
  org.killbill.billing.payment.api, \
28
30
  org.killbill.billing.subscription, \
data/lib/killbill/gen/api/account.rb CHANGED
@@ -34,7 +34,7 @@ module Killbill
34
34
 
35
35
  include org.killbill.billing.account.api.Account
36
36
 
37
- attr_accessor :id, :created_date, :updated_date, :external_key, :currency, :time_zone, :parent_account_id, :is_payment_delegated_to_parent, :fixed_offset_time_zone, :reference_time, :name, :first_name_length, :email, :bill_cycle_day_local, :payment_method_id, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices, :notes
37
+ attr_accessor :id, :created_date, :updated_date, :external_key, :currency, :time_zone, :fixed_offset_time_zone, :reference_time, :name, :first_name_length, :email, :bill_cycle_day_local, :payment_method_id, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices, :parent_account_id, :is_payment_delegated_to_parent, :notes
38
38
 
39
39
  def initialize()
40
40
  end
@@ -66,12 +66,6 @@ module Killbill
66
66
  @time_zone = Java::org.joda.time.DateTimeZone.forID((@time_zone.respond_to?(:identifier) ? @time_zone.identifier : @time_zone.to_s))
67
67
  end
68
68
 
69
- # conversion for parent_account_id [type = java.util.UUID]
70
- @parent_account_id = java.util.UUID.fromString(@parent_account_id.to_s) unless @parent_account_id.nil?
71
-
72
- # conversion for is_payment_delegated_to_parent [type = java.lang.Boolean]
73
- @is_payment_delegated_to_parent = @is_payment_delegated_to_parent.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_payment_delegated_to_parent)
74
-
75
69
  # conversion for fixed_offset_time_zone [type = org.joda.time.DateTimeZone]
76
70
  if !@fixed_offset_time_zone.nil?
77
71
  @fixed_offset_time_zone = Java::org.joda.time.DateTimeZone.forID((@fixed_offset_time_zone.respond_to?(:identifier) ? @fixed_offset_time_zone.identifier : @fixed_offset_time_zone.to_s))
@@ -131,6 +125,12 @@ module Killbill
131
125
  # conversion for is_notified_for_invoices [type = java.lang.Boolean]
132
126
  @is_notified_for_invoices = @is_notified_for_invoices.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_notified_for_invoices)
133
127
 
128
+ # conversion for parent_account_id [type = java.util.UUID]
129
+ @parent_account_id = java.util.UUID.fromString(@parent_account_id.to_s) unless @parent_account_id.nil?
130
+
131
+ # conversion for is_payment_delegated_to_parent [type = java.lang.Boolean]
132
+ @is_payment_delegated_to_parent = @is_payment_delegated_to_parent.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_payment_delegated_to_parent)
133
+
134
134
  # conversion for notes [type = java.lang.String]
135
135
  @notes = @notes.to_s unless @notes.nil?
136
136
  self
@@ -170,19 +170,6 @@ module Killbill
170
170
  @time_zone = TZInfo::Timezone.get(@time_zone.get_id)
171
171
  end
172
172
 
173
- # conversion for parent_account_id [type = java.util.UUID]
174
- @parent_account_id = j_obj.parent_account_id
175
- @parent_account_id = @parent_account_id.nil? ? nil : @parent_account_id.to_s
176
-
177
- # conversion for is_payment_delegated_to_parent [type = java.lang.Boolean]
178
- @is_payment_delegated_to_parent = j_obj.is_payment_delegated_to_parent
179
- if @is_payment_delegated_to_parent.nil?
180
- @is_payment_delegated_to_parent = false
181
- else
182
- tmp_bool = (@is_payment_delegated_to_parent.java_kind_of? java.lang.Boolean) ? @is_payment_delegated_to_parent.boolean_value : @is_payment_delegated_to_parent
183
- @is_payment_delegated_to_parent = tmp_bool ? true : false
184
- end
185
-
186
173
  # conversion for fixed_offset_time_zone [type = org.joda.time.DateTimeZone]
187
174
  @fixed_offset_time_zone = j_obj.fixed_offset_time_zone
188
175
  if !@fixed_offset_time_zone.nil?
@@ -258,6 +245,19 @@ module Killbill
258
245
  @is_notified_for_invoices = tmp_bool ? true : false
259
246
  end
260
247
 
248
+ # conversion for parent_account_id [type = java.util.UUID]
249
+ @parent_account_id = j_obj.parent_account_id
250
+ @parent_account_id = @parent_account_id.nil? ? nil : @parent_account_id.to_s
251
+
252
+ # conversion for is_payment_delegated_to_parent [type = java.lang.Boolean]
253
+ @is_payment_delegated_to_parent = j_obj.is_payment_delegated_to_parent
254
+ if @is_payment_delegated_to_parent.nil?
255
+ @is_payment_delegated_to_parent = false
256
+ else
257
+ tmp_bool = (@is_payment_delegated_to_parent.java_kind_of? java.lang.Boolean) ? @is_payment_delegated_to_parent.boolean_value : @is_payment_delegated_to_parent
258
+ @is_payment_delegated_to_parent = tmp_bool ? true : false
259
+ end
260
+
261
261
  # conversion for notes [type = java.lang.String]
262
262
  @notes = j_obj.notes
263
263
  self
data/lib/killbill/gen/api/account_data.rb CHANGED
@@ -34,7 +34,7 @@ module Killbill
34
34
 
35
35
  include org.killbill.billing.account.api.AccountData
36
36
 
37
- 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, :parent_account_id, :is_payment_delegated_to_parent, :notes
37
+ attr_accessor :external_key, :name, :first_name_length, :email, :bill_cycle_day_local, :currency, :payment_method_id, :reference_time, :time_zone, :locale, :address1, :address2, :company_name, :city, :state_or_province, :postal_code, :country, :phone, :is_migrated, :is_notified_for_invoices, :parent_account_id, :is_payment_delegated_to_parent, :notes
38
38
 
39
39
  def initialize()
40
40
  end
@@ -61,6 +61,12 @@ module Killbill
61
61
  # conversion for payment_method_id [type = java.util.UUID]
62
62
  @payment_method_id = java.util.UUID.fromString(@payment_method_id.to_s) unless @payment_method_id.nil?
63
63
 
64
+ # conversion for reference_time [type = org.joda.time.DateTime]
65
+ if !@reference_time.nil?
66
+ @reference_time = (@reference_time.kind_of? Time) ? DateTime.parse(@reference_time.to_s) : @reference_time
67
+ @reference_time = Java::org.joda.time.DateTime.new(@reference_time.to_s, Java::org.joda.time.DateTimeZone::UTC)
68
+ end
69
+
64
70
  # conversion for time_zone [type = org.joda.time.DateTimeZone]
65
71
  if !@time_zone.nil?
66
72
  @time_zone = Java::org.joda.time.DateTimeZone.forID((@time_zone.respond_to?(:identifier) ? @time_zone.identifier : @time_zone.to_s))
@@ -134,6 +140,14 @@ module Killbill
134
140
  @payment_method_id = j_obj.payment_method_id
135
141
  @payment_method_id = @payment_method_id.nil? ? nil : @payment_method_id.to_s
136
142
 
143
+ # conversion for reference_time [type = org.joda.time.DateTime]
144
+ @reference_time = j_obj.reference_time
145
+ if !@reference_time.nil?
146
+ fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
147
+ str = fmt.print(@reference_time)
148
+ @reference_time = DateTime.iso8601(str)
149
+ end
150
+
137
151
  # conversion for time_zone [type = org.joda.time.DateTimeZone]
138
152
  @time_zone = j_obj.time_zone
139
153
  if !@time_zone.nil?
data/lib/killbill/gen/api/block_price_override.rb ADDED
@@ -0,0 +1,81 @@
1
+ #############################################################################################
2
+ # #
3
+ # Copyright 2010-2013 Ning, Inc. #
4
+ # Copyright 2014 Groupon, Inc. #
5
+ # Copyright 2014 The Billing Project, LLC #
6
+ # #
7
+ # The Billing Project licenses this file to you under the Apache License, version 2.0 #
8
+ # (the "License"); you may not use this file except in compliance with the #
9
+ # License. You may obtain a copy of the License at: #
10
+ # #
11
+ # http://www.apache.org/licenses/LICENSE-2.0 #
12
+ # #
13
+ # Unless required by applicable law or agreed to in writing, software #
14
+ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT #
15
+ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the #
16
+ # License for the specific language governing permissions and limitations #
17
+ # under the License. #
18
+ # #
19
+ #############################################################################################
20
+
21
+
22
+ #
23
+ # DO NOT EDIT!!!
24
+ # File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
25
+ #
26
+
27
+
28
+ module Killbill
29
+ module Plugin
30
+ module Model
31
+
32
+ java_package 'org.killbill.billing.catalog.api'
33
+ class BlockPriceOverride
34
+
35
+ include org.killbill.billing.catalog.api.BlockPriceOverride
36
+
37
+ attr_accessor :unit_name, :size, :price, :currency
38
+
39
+ def initialize()
40
+ end
41
+
42
+ def to_java()
43
+ # conversion for unit_name [type = java.lang.String]
44
+ @unit_name = @unit_name.to_s unless @unit_name.nil?
45
+
46
+ # conversion for size [type = java.lang.Double]
47
+ @size = @size
48
+
49
+ # conversion for price [type = java.math.BigDecimal]
50
+ if @price.nil?
51
+ @price = java.math.BigDecimal::ZERO
52
+ else
53
+ @price = java.math.BigDecimal.new(@price.to_s)
54
+ end
55
+
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
+ self
59
+ end
60
+
61
+ def to_ruby(j_obj)
62
+ # conversion for unit_name [type = java.lang.String]
63
+ @unit_name = j_obj.unit_name
64
+
65
+ # conversion for size [type = java.lang.Double]
66
+ @size = j_obj.size
67
+
68
+ # conversion for price [type = java.math.BigDecimal]
69
+ @price = j_obj.price
70
+ @price = @price.nil? ? 0 : BigDecimal.new(@price.to_s)
71
+
72
+ # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
73
+ @currency = j_obj.currency
74
+ @currency = @currency.to_s.to_sym unless @currency.nil?
75
+ self
76
+ end
77
+
78
+ end
79
+ end
80
+ end
81
+ end