killbill 8.1.0 → 8.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +17 -17
- data/Jarfile +3 -3
- data/Jarfile.lock +52 -52
- data/NEWS +6 -0
- data/lib/killbill/gen/api/catalog_entity.rb +57 -0
- data/lib/killbill/gen/api/catalog_user_api.rb +17 -0
- data/lib/killbill/gen/api/invoice_user_api.rb +24 -0
- data/lib/killbill/gen/api/migration_plan.rb +7 -7
- data/lib/killbill/gen/api/mutable_catalog.rb +57 -0
- data/lib/killbill/gen/api/mutable_static_catalog.rb +175 -0
- data/lib/killbill/gen/api/payment.rb +20 -1
- data/lib/killbill/gen/api/payment_api.rb +36 -18
- data/lib/killbill/gen/api/payment_attempt.rb +189 -0
- data/lib/killbill/gen/api/plan.rb +7 -7
- data/lib/killbill/gen/api/plan_phase.rb +7 -7
- data/lib/killbill/gen/api/plan_phase_specifier.rb +8 -9
- data/lib/killbill/gen/api/plan_specifier.rb +8 -9
- data/lib/killbill/gen/api/require_gen.rb +5 -0
- data/lib/killbill/gen/api/simple_plan_descriptor.rb +101 -0
- data/lib/killbill/gen/api/tenant_user_api.rb +14 -0
- data/lib/killbill/helpers/active_merchant/killbill_spec_helper.rb +1 -1
- data/lib/killbill/helpers/active_merchant/payment_plugin.rb +1 -1
- data/lib/killbill/version.rb +1 -1
- metadata +77 -104
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 29fee0970cdeaff406a2aee20c1c520e713dc94c
|
|
4
|
+
data.tar.gz: 7c5f710a8e850cd5605175cda4915e465600d9d8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3e120adcb4df8eb458f03568d8ebdcc88f9896f03cea32a3b6bd57099cea244eafafcad5b4abb77b85a2931861a2d22ae3a3bd0504ab3cb60d218f17ae544b69
|
|
7
|
+
data.tar.gz: f234a09ec0ad9ebef215447ff62342c64a61afade91d379408ef4998b57ad7c534897fa040293f4e1847259aff8b73e7ce94094db711654dd850db32f57d4bf6
|
data/Gemfile.lock
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
killbill (8.
|
|
4
|
+
killbill (8.2.0)
|
|
5
5
|
rack (>= 1.5.2)
|
|
6
6
|
sinatra (~> 1.3.4)
|
|
7
7
|
typhoeus (~> 0.6.9)
|
|
@@ -10,13 +10,13 @@ PATH
|
|
|
10
10
|
GEM
|
|
11
11
|
remote: https://rubygems.org/
|
|
12
12
|
specs:
|
|
13
|
-
actionpack (4.1.
|
|
14
|
-
actionview (= 4.1.
|
|
15
|
-
activesupport (= 4.1.
|
|
13
|
+
actionpack (4.1.16)
|
|
14
|
+
actionview (= 4.1.16)
|
|
15
|
+
activesupport (= 4.1.16)
|
|
16
16
|
rack (~> 1.5.2)
|
|
17
17
|
rack-test (~> 0.6.2)
|
|
18
|
-
actionview (4.1.
|
|
19
|
-
activesupport (= 4.1.
|
|
18
|
+
actionview (4.1.16)
|
|
19
|
+
activesupport (= 4.1.16)
|
|
20
20
|
builder (~> 3.1)
|
|
21
21
|
erubis (~> 2.7.0)
|
|
22
22
|
active_utils (3.0.0)
|
|
@@ -27,17 +27,17 @@ GEM
|
|
|
27
27
|
builder (>= 2.1.2, < 4.0.0)
|
|
28
28
|
i18n (>= 0.6.9)
|
|
29
29
|
nokogiri (~> 1.4)
|
|
30
|
-
activemodel (4.1.
|
|
31
|
-
activesupport (= 4.1.
|
|
30
|
+
activemodel (4.1.16)
|
|
31
|
+
activesupport (= 4.1.16)
|
|
32
32
|
builder (~> 3.1)
|
|
33
|
-
activerecord (4.1.
|
|
34
|
-
activemodel (= 4.1.
|
|
35
|
-
activesupport (= 4.1.
|
|
33
|
+
activerecord (4.1.16)
|
|
34
|
+
activemodel (= 4.1.16)
|
|
35
|
+
activesupport (= 4.1.16)
|
|
36
36
|
arel (~> 5.0.0)
|
|
37
|
-
activerecord-bogacs (0.
|
|
37
|
+
activerecord-bogacs (0.5.0)
|
|
38
38
|
activerecord-jdbc-adapter (1.3.20)
|
|
39
39
|
activerecord (>= 2.2)
|
|
40
|
-
activesupport (4.1.
|
|
40
|
+
activesupport (4.1.16)
|
|
41
41
|
i18n (~> 0.6, >= 0.6.9)
|
|
42
42
|
json (~> 1.7, >= 1.7.7)
|
|
43
43
|
minitest (~> 5.1)
|
|
@@ -58,7 +58,7 @@ GEM
|
|
|
58
58
|
erubis (2.7.0)
|
|
59
59
|
ethon (0.9.0)
|
|
60
60
|
ffi (>= 1.3.0)
|
|
61
|
-
ffi (1.9.
|
|
61
|
+
ffi (1.9.14-java)
|
|
62
62
|
i18n (0.7.0)
|
|
63
63
|
ice_nine (0.11.2)
|
|
64
64
|
jar-dependencies (0.3.4)
|
|
@@ -70,7 +70,7 @@ GEM
|
|
|
70
70
|
jdbc-mariadb (1.1.9)
|
|
71
71
|
jdbc-sqlite3 (3.8.11.2)
|
|
72
72
|
json (1.8.3-java)
|
|
73
|
-
maven-tools (1.1.
|
|
73
|
+
maven-tools (1.1.6)
|
|
74
74
|
virtus (~> 1.0)
|
|
75
75
|
minitest (5.9.0)
|
|
76
76
|
monetize (1.1.0)
|
|
@@ -100,7 +100,7 @@ GEM
|
|
|
100
100
|
rspec-expectations (2.12.1)
|
|
101
101
|
diff-lcs (~> 1.1.3)
|
|
102
102
|
rspec-mocks (2.12.2)
|
|
103
|
-
ruby-maven (3.3.
|
|
103
|
+
ruby-maven (3.3.12)
|
|
104
104
|
ruby-maven-libs (~> 3.3.9)
|
|
105
105
|
ruby-maven-libs (3.3.9)
|
|
106
106
|
sinatra (1.3.6)
|
|
@@ -143,4 +143,4 @@ DEPENDENCIES
|
|
|
143
143
|
thread_safe (~> 0.3.4)
|
|
144
144
|
|
|
145
145
|
BUNDLED WITH
|
|
146
|
-
1.
|
|
146
|
+
1.11.2
|
data/Jarfile
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
jar 'org.kill-bill.billing:killbill-api', '0.
|
|
1
|
+
jar 'org.kill-bill.billing:killbill-api', '0.40'
|
|
2
2
|
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.20'
|
|
3
3
|
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.20'
|
|
4
4
|
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.20'
|
|
@@ -6,7 +6,7 @@ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.20'
|
|
|
6
6
|
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.20'
|
|
7
7
|
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.20'
|
|
8
8
|
jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.20'
|
|
9
|
-
jar 'org.kill-bill.billing:killbill-util:tests', '0.17.
|
|
10
|
-
jar 'org.kill-bill.billing:killbill-util', '0.17.
|
|
9
|
+
jar 'org.kill-bill.billing:killbill-util:tests', '0.17.2'
|
|
10
|
+
jar 'org.kill-bill.billing:killbill-util', '0.17.2'
|
|
11
11
|
jar 'org.mockito:mockito-all', '1.10.19'
|
|
12
12
|
jar 'javax.servlet:javax.servlet-api', '3.1.0'
|
data/Jarfile.lock
CHANGED
|
@@ -1,64 +1,64 @@
|
|
|
1
1
|
---
|
|
2
2
|
:runtime:
|
|
3
|
-
-
|
|
4
|
-
- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.20
|
|
5
|
-
- org.javassist:javassist:jar:3.19.0-GA
|
|
6
|
-
- org.apache.shiro:shiro-core:jar:1.2.3
|
|
3
|
+
- io.dropwizard.metrics:metrics-core:jar:3.1.1
|
|
7
4
|
- joda-time:joda-time:jar:2.3
|
|
8
|
-
-
|
|
9
|
-
-
|
|
10
|
-
- org.kill-bill.
|
|
11
|
-
- com.google.
|
|
5
|
+
- org.weakref:jmxutils:jar:1.18
|
|
6
|
+
- commons-beanutils:commons-beanutils:jar:1.8.3
|
|
7
|
+
- org.kill-bill.commons:killbill-clock:jar:0.19
|
|
8
|
+
- com.google.inject:guice:jar:3.0
|
|
12
9
|
- org.osgi:org.osgi.core:jar:5.0.0
|
|
13
|
-
-
|
|
14
|
-
-
|
|
15
|
-
- org.
|
|
16
|
-
-
|
|
17
|
-
- org.
|
|
18
|
-
-
|
|
10
|
+
- com.fasterxml.jackson.core:jackson-databind:jar:2.4.5
|
|
11
|
+
- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.20
|
|
12
|
+
- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.20
|
|
13
|
+
- com.samskivert:jmustache:jar:1.5
|
|
14
|
+
- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.20
|
|
15
|
+
- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.5
|
|
16
|
+
- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.20
|
|
17
|
+
- org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
|
|
18
|
+
- com.h2database:h2:jar:1.4.186
|
|
19
|
+
- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.31
|
|
20
|
+
- com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.5
|
|
21
|
+
- org.kill-bill.commons:killbill-queue:jar:0.19
|
|
22
|
+
- org.kill-bill.billing:killbill-util:jar:tests:0.17.2
|
|
23
|
+
- javax.activation:activation:jar:1.1
|
|
24
|
+
- org.javassist:javassist:jar:3.19.0-GA
|
|
19
25
|
- org.skife.config:config-magic:jar:0.14
|
|
26
|
+
- org.kill-bill.billing:killbill-util:jar:0.17.2
|
|
27
|
+
- org.mockito:mockito-all:jar:1.10.19
|
|
28
|
+
- org.apache.commons:commons-email:jar:1.2
|
|
20
29
|
- antlr:antlr:jar:2.7.7
|
|
21
|
-
-
|
|
30
|
+
- aopalliance:aopalliance:jar:1.0
|
|
31
|
+
- org.kill-bill.commons:killbill-concurrent:jar:0.19
|
|
32
|
+
- com.zaxxer:HikariCP-java6:jar:2.3.7
|
|
33
|
+
- org.slf4j:slf4j-api:jar:1.7.21
|
|
34
|
+
- com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
|
|
22
35
|
- org.antlr:stringtemplate:jar:3.2.1
|
|
23
|
-
- org.
|
|
24
|
-
- org.
|
|
36
|
+
- org.kill-bill.commons:killbill-jdbi:jar:0.19
|
|
37
|
+
- org.kill-bill.billing:killbill-platform-api:jar:0.31
|
|
38
|
+
- org.slf4j:jcl-over-slf4j:jar:1.7.21
|
|
39
|
+
- javax.mail:mail:jar:1.4.1
|
|
40
|
+
- org.kill-bill.billing:killbill-api:jar:0.40
|
|
41
|
+
- io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
|
|
42
|
+
- org.kill-bill.commons:killbill-xmlloader:jar:0.19
|
|
43
|
+
- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.20
|
|
44
|
+
- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.20
|
|
25
45
|
- org.jdbi:jdbi:jar:2.62
|
|
26
|
-
- com.fasterxml.jackson.core:jackson-
|
|
27
|
-
- org.kill-bill.billing:killbill-internal-api:jar:0.17.1
|
|
28
|
-
- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.20
|
|
29
|
-
- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.30
|
|
30
|
-
- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.3
|
|
31
|
-
- com.google.inject:guice:jar:3.0
|
|
32
|
-
- com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
|
|
46
|
+
- com.fasterxml.jackson.core:jackson-core:jar:2.4.5
|
|
33
47
|
- org.apache.felix:org.apache.felix.framework:jar:4.4.1
|
|
34
|
-
-
|
|
35
|
-
-
|
|
36
|
-
- org.kill-bill.billing
|
|
37
|
-
- org.slf4j:jcl-over-slf4j:jar:1.7.21
|
|
38
|
-
- org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
|
|
39
|
-
- org.kill-bill.commons:killbill-clock:jar:0.18
|
|
40
|
-
- com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.3
|
|
41
|
-
- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.20
|
|
42
|
-
- org.kill-bill.billing:killbill-api:jar:0.38
|
|
43
|
-
- com.fasterxml.jackson.core:jackson-core:jar:2.4.3
|
|
48
|
+
- org.joda:joda-money:jar:0.9
|
|
49
|
+
- org.apache.shiro:shiro-core:jar:1.2.3
|
|
50
|
+
- org.kill-bill.billing:killbill-internal-api:jar:0.17.2
|
|
44
51
|
- com.google.guava:guava:jar:r09
|
|
45
|
-
-
|
|
46
|
-
-
|
|
47
|
-
- org.
|
|
48
|
-
- io.dropwizard.metrics:metrics-core:jar:3.1.1
|
|
49
|
-
- org.weakref:jmxutils:jar:1.18
|
|
50
|
-
- com.google.inject.extensions:guice-multibindings:jar:3.0
|
|
51
|
-
- javax.inject:javax.inject:jar:1
|
|
52
|
-
- org.slf4j:slf4j-api:jar:1.7.21
|
|
53
|
-
- commons-beanutils:commons-beanutils:jar:1.8.3
|
|
52
|
+
- org.kill-bill.billing:killbill-platform-base:jar:0.31
|
|
53
|
+
- org.kill-bill.billing:killbill-platform-osgi:jar:0.31
|
|
54
|
+
- org.osgi:org.osgi.compendium:jar:5.0.0
|
|
54
55
|
- javax.servlet:javax.servlet-api:jar:3.1.0
|
|
55
|
-
- org.
|
|
56
|
-
-
|
|
57
|
-
-
|
|
58
|
-
- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.18
|
|
59
|
-
- org.kill-bill.commons:killbill-jdbi:jar:0.18
|
|
60
|
-
- org.mockito:mockito-all:jar:1.10.19
|
|
61
|
-
- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.20
|
|
56
|
+
- org.apache.shiro:shiro-ehcache:jar:1.2.3
|
|
57
|
+
- javax.inject:javax.inject:jar:1
|
|
58
|
+
- com.google.inject.extensions:guice-multibindings:jar:3.0
|
|
62
59
|
- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.20
|
|
63
|
-
-
|
|
64
|
-
- org.
|
|
60
|
+
- net.sf.ehcache:ehcache:jar:2.9.1
|
|
61
|
+
- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.19
|
|
62
|
+
- org.apache.shiro:shiro-guice:jar:1.2.3
|
|
63
|
+
- org.kill-bill.commons:killbill-locker:jar:0.19
|
|
64
|
+
- com.google.code.findbugs:annotations:jar:3.0.0
|
data/NEWS
CHANGED
|
@@ -0,0 +1,57 @@
|
|
|
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 CatalogEntity
|
|
34
|
+
|
|
35
|
+
include org.killbill.billing.catalog.api.CatalogEntity
|
|
36
|
+
|
|
37
|
+
attr_accessor :name
|
|
38
|
+
|
|
39
|
+
def initialize()
|
|
40
|
+
end
|
|
41
|
+
|
|
42
|
+
def to_java()
|
|
43
|
+
# conversion for name [type = java.lang.String]
|
|
44
|
+
@name = @name.to_s unless @name.nil?
|
|
45
|
+
self
|
|
46
|
+
end
|
|
47
|
+
|
|
48
|
+
def to_ruby(j_obj)
|
|
49
|
+
# conversion for name [type = java.lang.String]
|
|
50
|
+
@name = j_obj.name
|
|
51
|
+
self
|
|
52
|
+
end
|
|
53
|
+
|
|
54
|
+
end
|
|
55
|
+
end
|
|
56
|
+
end
|
|
57
|
+
end
|
|
@@ -85,6 +85,23 @@ module Killbill
|
|
|
85
85
|
context = context.to_java unless context.nil?
|
|
86
86
|
@real_java_api.upload_catalog(catalogXML, context)
|
|
87
87
|
end
|
|
88
|
+
|
|
89
|
+
java_signature 'Java::void addSimplePlan(Java::org.killbill.billing.catalog.api.SimplePlanDescriptor, Java::org.joda.time.DateTime, Java::org.killbill.billing.util.callcontext.CallContext)'
|
|
90
|
+
def add_simple_plan(planDescriptor, requestedDate, context)
|
|
91
|
+
|
|
92
|
+
# conversion for planDescriptor [type = org.killbill.billing.catalog.api.SimplePlanDescriptor]
|
|
93
|
+
planDescriptor = planDescriptor.to_java unless planDescriptor.nil?
|
|
94
|
+
|
|
95
|
+
# conversion for requestedDate [type = org.joda.time.DateTime]
|
|
96
|
+
if !requestedDate.nil?
|
|
97
|
+
requestedDate = (requestedDate.kind_of? Time) ? DateTime.parse(requestedDate.to_s) : requestedDate
|
|
98
|
+
requestedDate = Java::org.joda.time.DateTime.new(requestedDate.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
|
99
|
+
end
|
|
100
|
+
|
|
101
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
|
|
102
|
+
context = context.to_java unless context.nil?
|
|
103
|
+
@real_java_api.add_simple_plan(planDescriptor, requestedDate, context)
|
|
104
|
+
end
|
|
88
105
|
end
|
|
89
106
|
end
|
|
90
107
|
end
|
|
@@ -539,6 +539,30 @@ module Killbill
|
|
|
539
539
|
context = context.to_java unless context.nil?
|
|
540
540
|
@real_java_api.transfer_child_credit_to_parent(childAccountId, context)
|
|
541
541
|
end
|
|
542
|
+
|
|
543
|
+
java_signature 'Java::java.util.List getInvoiceItemsByParentInvoice(Java::java.util.UUID, Java::org.killbill.billing.util.callcontext.TenantContext)'
|
|
544
|
+
def get_invoice_items_by_parent_invoice(parentInvoiceId, context)
|
|
545
|
+
|
|
546
|
+
# conversion for parentInvoiceId [type = java.util.UUID]
|
|
547
|
+
parentInvoiceId = java.util.UUID.fromString(parentInvoiceId.to_s) unless parentInvoiceId.nil?
|
|
548
|
+
|
|
549
|
+
# conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
|
|
550
|
+
context = context.to_java unless context.nil?
|
|
551
|
+
begin
|
|
552
|
+
res = @real_java_api.get_invoice_items_by_parent_invoice(parentInvoiceId, context)
|
|
553
|
+
# conversion for res [type = java.util.List]
|
|
554
|
+
tmp = []
|
|
555
|
+
(res || []).each do |m|
|
|
556
|
+
# conversion for m [type = org.killbill.billing.invoice.api.InvoiceItem]
|
|
557
|
+
m = Killbill::Plugin::Model::InvoiceItem.new.to_ruby(m) unless m.nil?
|
|
558
|
+
tmp << m
|
|
559
|
+
end
|
|
560
|
+
res = tmp
|
|
561
|
+
return res
|
|
562
|
+
rescue Java::org.killbill.billing.invoice.api.InvoiceApiException => e
|
|
563
|
+
raise Killbill::Plugin::Model::InvoiceApiException.new.to_ruby(e)
|
|
564
|
+
end
|
|
565
|
+
end
|
|
542
566
|
end
|
|
543
567
|
end
|
|
544
568
|
end
|
|
@@ -34,7 +34,7 @@ module Killbill
|
|
|
34
34
|
|
|
35
35
|
include org.killbill.billing.catalog.api.MigrationPlan
|
|
36
36
|
|
|
37
|
-
attr_accessor :initial_phases, :product, :price_list_name, :
|
|
37
|
+
attr_accessor :initial_phases, :product, :price_list_name, :initial_phase_iterator, :final_phase, :recurring_billing_period, :plans_allowed_in_bundle, :all_phases, :effective_date_for_existing_subscriptions, :name
|
|
38
38
|
|
|
39
39
|
def initialize()
|
|
40
40
|
end
|
|
@@ -55,9 +55,6 @@ module Killbill
|
|
|
55
55
|
# conversion for price_list_name [type = java.lang.String]
|
|
56
56
|
@price_list_name = @price_list_name.to_s unless @price_list_name.nil?
|
|
57
57
|
|
|
58
|
-
# conversion for name [type = java.lang.String]
|
|
59
|
-
@name = @name.to_s unless @name.nil?
|
|
60
|
-
|
|
61
58
|
# conversion for initial_phase_iterator [type = java.util.Iterator]
|
|
62
59
|
@initial_phase_iterator = Killbill::Plugin::Model::EnumeratorIterator.new(@initial_phase_iterator)
|
|
63
60
|
|
|
@@ -85,6 +82,9 @@ module Killbill
|
|
|
85
82
|
@effective_date_for_existing_subscriptions = Java::org.joda.time.DateTime.new(@effective_date_for_existing_subscriptions.to_s, Java::org.joda.time.DateTimeZone::UTC)
|
|
86
83
|
@effective_date_for_existing_subscriptions = @effective_date_for_existing_subscriptions.to_date
|
|
87
84
|
end
|
|
85
|
+
|
|
86
|
+
# conversion for name [type = java.lang.String]
|
|
87
|
+
@name = @name.to_s unless @name.nil?
|
|
88
88
|
self
|
|
89
89
|
end
|
|
90
90
|
|
|
@@ -106,9 +106,6 @@ module Killbill
|
|
|
106
106
|
# conversion for price_list_name [type = java.lang.String]
|
|
107
107
|
@price_list_name = j_obj.price_list_name
|
|
108
108
|
|
|
109
|
-
# conversion for name [type = java.lang.String]
|
|
110
|
-
@name = j_obj.name
|
|
111
|
-
|
|
112
109
|
# conversion for initial_phase_iterator [type = java.util.Iterator]
|
|
113
110
|
@initial_phase_iterator = j_obj.initial_phase_iterator
|
|
114
111
|
|
|
@@ -141,6 +138,9 @@ module Killbill
|
|
|
141
138
|
str = fmt.print(@effective_date_for_existing_subscriptions)
|
|
142
139
|
@effective_date_for_existing_subscriptions = DateTime.iso8601(str)
|
|
143
140
|
end
|
|
141
|
+
|
|
142
|
+
# conversion for name [type = java.lang.String]
|
|
143
|
+
@name = j_obj.name
|
|
144
144
|
self
|
|
145
145
|
end
|
|
146
146
|
|
|
@@ -0,0 +1,57 @@
|
|
|
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 MutableCatalog
|
|
34
|
+
|
|
35
|
+
include org.killbill.billing.catalog.api.MutableCatalog
|
|
36
|
+
|
|
37
|
+
attr_accessor :catalog_name
|
|
38
|
+
|
|
39
|
+
def initialize()
|
|
40
|
+
end
|
|
41
|
+
|
|
42
|
+
def to_java()
|
|
43
|
+
# conversion for catalog_name [type = java.lang.String]
|
|
44
|
+
@catalog_name = @catalog_name.to_s unless @catalog_name.nil?
|
|
45
|
+
self
|
|
46
|
+
end
|
|
47
|
+
|
|
48
|
+
def to_ruby(j_obj)
|
|
49
|
+
# conversion for catalog_name [type = java.lang.String]
|
|
50
|
+
@catalog_name = j_obj.catalog_name
|
|
51
|
+
self
|
|
52
|
+
end
|
|
53
|
+
|
|
54
|
+
end
|
|
55
|
+
end
|
|
56
|
+
end
|
|
57
|
+
end
|