killbill 7.0.6 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1730160e98115add24b6b457985e313299e2f32
-  data.tar.gz: 1dc1a41b89290563650c62cd37a120c38d18e64a
+  metadata.gz: affd2724e04c271fa046588a33d8025f942ff1f5
+  data.tar.gz: 5069906730e69d6acbd771e51824fabcb4ac84ce
 SHA512:
-  metadata.gz: 34090213e5cad5b2073e4f4f9098cba35fde5f09606eac5eef1384a575b32b098f9877c5211275fba5c45c77ca3bd2c7acb02a01feb41c64fe022d04d6a8f118
-  data.tar.gz: 080dabf41fb14e0accaa031f5c4eee87336c4b768530fb2cf3e95a0b80ccaab7637f553109726d20ef5a7362f732751626603b6e6ea25ec4ce096235dd2a78f8
+  metadata.gz: 49c3f44828e1f1a93667cc124e2be6cbad2c6f42a9acf99edcc0c1da69201e80ee4761af8733b39a22ccee7a61c426c801a2da559b4c0db03490faf1edf9bb8e
+  data.tar.gz: 383ea040eac1413d4a3dcbaeef81be3db53f5d16fb401e5eca2292854a2996875fa7a693904f750674eebf74bb1d1f2801e8f826d4cfdeeff41dd9146cf060ba

data/.travis.yml

@@ -6,14 +6,9 @@ cache:
   directories:
     - $HOME/.m2
 
-services:
-  - mysql
-  - postgresql
-
 before_script:
   - bundle exec jbundle install
   - mysql -uroot -e 'create database killbill_test;'
-  - psql -c 'create database killbill_test;' -U postgres
 
 notifications:
   email:
@@ -25,7 +20,6 @@ env:
   matrix:
     # Need MySQL 5.6 - see https://github.com/travis-ci/travis-ci/issues/1986
     #- AR_ADAPTER='mariadb' AR_USERNAME='root' AR_PASSWORD='' AR_DATABASE='killbill_test'
-    - AR_ADAPTER='postgresql' AR_USERNAME='postgres' AR_DATABASE='killbill_test'
     - AR_ADAPTER='sqlite3' AR_DATABASE='test.db'
 
 rvm:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill (7.0.6)
+    killbill (8.0.0)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)
@@ -61,24 +61,23 @@ GEM
     ffi (1.9.10-java)
     i18n (0.7.0)
     ice_nine (0.11.2)
-    jar-dependencies (0.3.2)
-    jbundler (0.9.2)
+    jar-dependencies (0.3.4)
+    jbundler (0.9.3)
       bundler (~> 1.5)
-      jar-dependencies (~> 0.2)
-      maven-tools (~> 1.0.10)
-      ruby-maven (~> 3.3, >= 3.3.3)
+      jar-dependencies (~> 0.3)
+      maven-tools (~> 1.1)
+      ruby-maven (~> 3.3, >= 3.3.8)
     jdbc-mariadb (1.1.9)
-    jdbc-postgres (9.4.1206)
     jdbc-sqlite3 (3.8.11.2)
     json (1.8.3-java)
-    maven-tools (1.0.13)
+    maven-tools (1.1.4)
       virtus (~> 1.0)
-    minitest (5.8.4)
+    minitest (5.9.0)
     monetize (1.1.0)
       money (~> 6.5.0)
     money (6.5.1)
       i18n (>= 0.6.4, <= 0.7.0)
-    nokogiri (1.6.7.2-java)
+    nokogiri (1.6.8-java)
     offsite_payments (2.1.0)
       actionpack (>= 3.2.20, < 5.0.0)
       active_utils (~> 3.0.0)
@@ -101,9 +100,9 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
-    ruby-maven (3.3.10)
-      ruby-maven-libs (~> 3.3.1)
-    ruby-maven-libs (3.3.3)
+    ruby-maven (3.3.11)
+      ruby-maven-libs (~> 3.3.9)
+    ruby-maven-libs (3.3.9)
     sinatra (1.3.6)
       rack (~> 1.4)
       rack-protection (~> 1.3)
@@ -133,7 +132,6 @@ DEPENDENCIES
   activerecord-jdbc-adapter (~> 1.3)
   jbundler (~> 0.9.2)
   jdbc-mariadb (~> 1.1.8)
-  jdbc-postgres (~> 9.4)
   jdbc-sqlite3 (~> 3.7)
   killbill!
   monetize (~> 1.1.0)
@@ -145,4 +143,4 @@ DEPENDENCIES
   thread_safe (~> 0.3.4)
 
 BUNDLED WITH
-   1.11.2
+   1.10.6

data/Jarfile

@@ -1,11 +1,12 @@
-jar 'org.kill-bill.billing:killbill-api', '0.32'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.18'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.15.10'
+jar 'org.kill-bill.billing:killbill-api', '0.34'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.19'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.19'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.19'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.19'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.19'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.19'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.19'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.17.0'
+jar 'org.kill-bill.billing:killbill-util', '0.17.0'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/Jarfile.lock

@@ -1,61 +1,64 @@
 ---
 :runtime:
-- io.dropwizard.metrics:metrics-core:jar:3.1.1
-- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.18
-- com.fasterxml.jackson.core:jackson-core:jar:2.4.3
+- org.kill-bill.billing:killbill-platform-base:jar:0.27
+- org.javassist:javassist:jar:3.19.0-GA
+- org.apache.shiro:shiro-core:jar:1.2.3
 - joda-time:joda-time:jar:2.3
-- org.weakref:jmxutils:jar:1.18
-- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.18
-- commons-beanutils:commons-beanutils:jar:1.8.3
-- org.kill-bill.billing:killbill-internal-api:jar:0.15.10
-- org.kill-bill.commons:killbill-xmlloader:jar:0.11
-- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.18
-- com.google.inject:guice:jar:3.0
+- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.19
+- net.sf.ehcache:ehcache:jar:2.9.1
+- aopalliance:aopalliance:jar:1.0
+- com.google.code.findbugs:annotations:jar:3.0.0
 - org.osgi:org.osgi.core:jar:5.0.0
-- org.slf4j:slf4j-api:jar:1.7.12
-- com.samskivert:jmustache:jar:1.5
-- org.kill-bill.billing:killbill-util:jar:tests:0.15.10
-- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.18
-- org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
-- com.h2database:h2:jar:1.4.186
-- javax.activation:activation:jar:1.1
-- org.skife.config:config-magic:jar:0.14
-- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.3
-- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.18
+- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.19
+- com.zaxxer:HikariCP-java6:jar:2.3.7
+- org.apache.shiro:shiro-guice:jar:1.2.3
+- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.19
 - org.apache.commons:commons-email:jar:1.2
-- org.mockito:mockito-all:jar:1.10.19
+- org.skife.config:config-magic:jar:0.14
 - antlr:antlr:jar:2.7.7
-- aopalliance:aopalliance:jar:1.0
-- com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
+- org.kill-bill.billing:killbill-platform-api:jar:0.27
 - org.antlr:stringtemplate:jar:3.2.1
-- org.kill-bill.commons:killbill-clock:jar:0.11
-- javax.mail:mail:jar:1.4.1
-- org.kill-bill.billing:killbill-platform-base:jar:0.15
-- io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
-- org.slf4j:jcl-over-slf4j:jar:1.7.12
-- org.jdbi:jdbi:jar:2.62
-- org.kill-bill.billing:killbill-platform-api:jar:0.15
-- org.kill-bill.billing:killbill-platform-osgi:jar:0.15
-- org.apache.felix:org.apache.felix.framework:jar:4.4.1
+- org.apache.shiro:shiro-ehcache:jar:1.2.3
 - org.joda:joda-money:jar:0.9
-- org.kill-bill.commons:killbill-jdbi:jar:0.11
-- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.11
-- org.apache.shiro:shiro-core:jar:1.2.3
-- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.15
-- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.18
+- org.jdbi:jdbi:jar:2.62
+- com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
+- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.3
+- com.google.inject:guice:jar:3.0
 - com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
-- com.google.guava:guava:jar:r09
-- org.kill-bill.commons:killbill-locker:jar:0.11
-- org.osgi:org.osgi.compendium:jar:5.0.0
-- org.kill-bill.commons:killbill-queue:jar:0.11
-- org.kill-bill.commons:killbill-concurrent:jar:0.11
-- javax.servlet:javax.servlet-api:jar:3.1.0
-- org.apache.shiro:shiro-ehcache:jar:1.2.3
-- javax.inject:javax.inject:jar:1
+- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.19
+- org.apache.felix:org.apache.felix.framework:jar:4.4.1
+- org.kill-bill.billing:killbill-api:jar:0.34
+- com.samskivert:jmustache:jar:1.5
+- org.kill-bill.commons:killbill-queue:jar:0.16
+- com.h2database:h2:jar:1.4.186
+- org.kill-bill.commons:killbill-jdbi:jar:0.16
+- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.27
+- org.slf4j:jcl-over-slf4j:jar:1.7.21
+- org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
+- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.16
+- org.kill-bill.billing:killbill-util:jar:0.17.0
 - com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.3
+- org.kill-bill.billing:killbill-internal-api:jar:0.17.0
+- org.kill-bill.commons:killbill-concurrent:jar:0.16
+- com.fasterxml.jackson.core:jackson-core:jar:2.4.3
+- com.google.guava:guava:jar:r09
+- javax.mail:mail:jar:1.4.1
+- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.19
+- javax.activation:activation:jar:1.1
+- org.kill-bill.commons:killbill-xmlloader:jar:0.16
+- io.dropwizard.metrics:metrics-core:jar:3.1.1
+- org.kill-bill.billing:killbill-platform-osgi:jar:0.27
+- org.kill-bill.commons:killbill-clock:jar:0.16
+- org.weakref:jmxutils:jar:1.18
 - com.google.inject.extensions:guice-multibindings:jar:3.0
-- net.sf.ehcache:ehcache:jar:2.9.1
-- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.18
-- org.kill-bill.billing:killbill-api:jar:0.32
-- org.apache.shiro:shiro-guice:jar:1.2.3
-- com.google.code.findbugs:annotations:jar:3.0.0
+- javax.inject:javax.inject:jar:1
+- org.slf4j:slf4j-api:jar:1.7.21
+- commons-beanutils:commons-beanutils:jar:1.8.3
+- javax.servlet:javax.servlet-api:jar:3.1.0
+- io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
+- org.kill-bill.commons:killbill-locker:jar:0.16
+- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.19
+- org.kill-bill.billing:killbill-util:jar:tests:0.17.0
+- org.mockito:mockito-all:jar:1.10.19
+- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.19
+- org.osgi:org.osgi.compendium:jar:5.0.0

data/NEWS

@@ -1,7 +1,3 @@
-7.0.6
-    ActiveMerchant: pass currency to auth_reversal call
-    Improve PostgreSQL support
-
 7.0.5
     Fix regression when loading Rake tasks
 

data/README.md

@@ -1,6 +1,19 @@
 [![Build Status](https://travis-ci.org/killbill/killbill-plugin-framework-ruby.png)](https://travis-ci.org/killbill/killbill-plugin-framework-ruby)
 [![Code Climate](https://codeclimate.com/github/killbill/killbill-plugin-framework-ruby.png)](https://codeclimate.com/github/killbill/killbill-plugin-framework-ruby)
 
+
+Kill Bill compatibility
+-----------------------
+
+| Plugin Framework version | Kill Bill version |
+| -----------------------: | ----------------: |
+| 7.x.y                    | 0.16.z            |
+| -----------------------: | ----------------: |
+| 8.x.y                    | 0.18.z(and 0.17.x)|
+
+
+
+
 killbill-plugin-framework-ruby
 ==============================
 
@@ -249,5 +262,4 @@ To change the database driver:
 
 ```bash
 AR_ADAPTER=mariadb AR_USERNAME=root AR_PASSWORD=root AR_DATABASE=kbtest rake
-AR_ADAPTER=postgresql AR_DATABASE=kbtest rake
 ```

data/generators/active_merchant/templates/spec/spec_helper.rb

@@ -12,15 +12,11 @@ RSpec.configure do |config|
   config.formatter = 'documentation'
 end
 
-require defined?(JRUBY_VERSION) ? 'arjdbc' : 'active_record'
-db_config = {
-    :adapter => ENV['AR_ADAPTER'] || 'sqlite3',
-    :database => ENV['AR_DATABASE'] || 'test.db',
-}
-db_config[:username] = ENV['AR_USERNAME'] if ENV['AR_USERNAME']
-db_config[:password] = ENV['AR_PASSWORD'] if ENV['AR_PASSWORD']
-ActiveRecord::Base.establish_connection(db_config)
-
+require 'active_record'
+ActiveRecord::Base.establish_connection(
+    :adapter => 'sqlite3',
+    :database => 'test.db'
+)
 # For debugging
 #ActiveRecord::Base.logger = Logger.new(STDOUT)
 # Create the schema

data/killbill.gemspec

@@ -37,7 +37,6 @@ Gem::Specification.new do |s|
     # See https://github.com/killbill/killbill-plugin-framework-ruby/issues/33
     s.add_development_dependency 'activerecord-jdbc-adapter', '~> 1.3'
     s.add_development_dependency 'jdbc-mariadb', '~> 1.1.8'
-    s.add_development_dependency 'jdbc-postgres', '~> 9.4'
   end
   s.add_development_dependency 'actionpack', '~> 4.1.0'
   s.add_development_dependency 'actionview', '~> 4.1.0'

data/lib/killbill/gen/api/account.rb

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.account.api.Account
 
-        attr_accessor :id, :created_date, :updated_date, :external_key, :currency, :time_zone, :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
+        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
 
         def initialize()
         end
@@ -66,6 +66,17 @@ module Killbill
             @time_zone = Java::org.joda.time.DateTimeZone.forID((@time_zone.respond_to?(:identifier) ? @time_zone.identifier : @time_zone.to_s))
           end
 
+          # conversion for fixed_offset_time_zone [type = org.joda.time.DateTimeZone]
+          if !@fixed_offset_time_zone.nil?
+            @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))
+          end
+
+          # conversion for reference_time [type = org.joda.time.DateTime]
+          if !@reference_time.nil?
+            @reference_time =  (@reference_time.kind_of? Time) ? DateTime.parse(@reference_time.to_s) : @reference_time
+            @reference_time = Java::org.joda.time.DateTime.new(@reference_time.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          end
+
           # conversion for name [type = java.lang.String]
           @name = @name.to_s unless @name.nil?
 
@@ -150,6 +161,20 @@ module Killbill
             @time_zone = TZInfo::Timezone.get(@time_zone.get_id)
           end
 
+          # conversion for fixed_offset_time_zone [type = org.joda.time.DateTimeZone]
+          @fixed_offset_time_zone = j_obj.fixed_offset_time_zone
+          if !@fixed_offset_time_zone.nil?
+            @fixed_offset_time_zone = TZInfo::Timezone.get(@fixed_offset_time_zone.get_id)
+          end
+
+          # conversion for reference_time [type = org.joda.time.DateTime]
+          @reference_time = j_obj.reference_time
+          if !@reference_time.nil?
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
+            str = fmt.print(@reference_time)
+            @reference_time = DateTime.iso8601(str)
+          end
+
           # conversion for name [type = java.lang.String]
           @name = j_obj.name
 

data/lib/killbill/gen/api/dry_run_arguments.rb

@@ -52,10 +52,9 @@ module Killbill
           # conversion for subscription_id [type = java.util.UUID]
           @subscription_id = java.util.UUID.fromString(@subscription_id.to_s) unless @subscription_id.nil?
 
-          # conversion for effective_date [type = org.joda.time.DateTime]
+          # conversion for effective_date [type = org.joda.time.LocalDate]
           if !@effective_date.nil?
-            @effective_date =  (@effective_date.kind_of? Time) ? DateTime.parse(@effective_date.to_s) : @effective_date
-            @effective_date = Java::org.joda.time.DateTime.new(@effective_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
+            @effective_date = Java::org.joda.time.LocalDate.parse(@effective_date.to_s)
           end
 
           # conversion for bundle_id [type = java.util.UUID]
@@ -92,12 +91,10 @@ module Killbill
           @subscription_id = j_obj.subscription_id
           @subscription_id = @subscription_id.nil? ? nil : @subscription_id.to_s
 
-          # conversion for effective_date [type = org.joda.time.DateTime]
+          # conversion for effective_date [type = org.joda.time.LocalDate]
           @effective_date = j_obj.effective_date
           if !@effective_date.nil?
-            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
-            str = fmt.print(@effective_date)
-            @effective_date = DateTime.iso8601(str)
+            @effective_date = @effective_date.to_s
           end
 
           # conversion for bundle_id [type = java.util.UUID]

data/lib/killbill/gen/api/entitlement.rb

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.entitlement.api.Entitlement
 
-        attr_accessor :id, :created_date, :updated_date, :base_entitlement_id, :bundle_id, :account_id, :external_key, :state, :source_type, :effective_start_date, :effective_end_date, :last_active_product, :last_active_plan, :last_active_phase, :last_active_price_list, :last_active_product_category
+        attr_accessor :id, :created_date, :updated_date, :base_entitlement_id, :bundle_id, :account_id, :external_key, :state, :source_type, :effective_start_date, :effective_end_date, :last_active_product, :last_active_plan, :last_active_phase, :last_active_price_list, :last_active_product_category, :bill_cycle_day_local
 
         def initialize()
         end
@@ -97,6 +97,9 @@ module Killbill
 
           # conversion for last_active_product_category [type = org.killbill.billing.catalog.api.ProductCategory]
           @last_active_product_category = Java::org.killbill.billing.catalog.api.ProductCategory.value_of( @last_active_product_category.to_s ) unless @last_active_product_category.nil?
+
+          # conversion for bill_cycle_day_local [type = java.lang.Integer]
+          @bill_cycle_day_local = @bill_cycle_day_local
           self
         end
 
@@ -175,6 +178,9 @@ module Killbill
           # conversion for last_active_product_category [type = org.killbill.billing.catalog.api.ProductCategory]
           @last_active_product_category = j_obj.last_active_product_category
           @last_active_product_category = @last_active_product_category.to_s.to_sym unless @last_active_product_category.nil?
+
+          # conversion for bill_cycle_day_local [type = java.lang.Integer]
+          @bill_cycle_day_local = j_obj.bill_cycle_day_local
           self
         end
 

data/lib/killbill/gen/api/entitlement_api.rb

@@ -39,8 +39,8 @@ module Killbill
         end
 
 
-        java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement createBaseEntitlement(Java::java.util.UUID, Java::org.killbill.billing.catalog.api.PlanPhaseSpecifier, Java::java.lang.String, Java::java.util.List, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def create_base_entitlement(accountId, spec, externalKey, overrides, effectiveDate, properties, context)
+        java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement createBaseEntitlement(Java::java.util.UUID, Java::org.killbill.billing.catalog.api.PlanPhaseSpecifier, Java::java.lang.String, Java::java.util.List, Java::org.joda.time.LocalDate, Java::org.joda.time.LocalDate, Java::boolean, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def create_base_entitlement(accountId, spec, externalKey, overrides, entitlementEffectiveDate, billingEffectiveDate, isMigrated, properties, context)
 
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
@@ -60,11 +60,19 @@ module Killbill
           end
           overrides = tmp
 
-          # conversion for effectiveDate [type = org.joda.time.LocalDate]
-          if !effectiveDate.nil?
-            effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
+          # conversion for entitlementEffectiveDate [type = org.joda.time.LocalDate]
+          if !entitlementEffectiveDate.nil?
+            entitlementEffectiveDate = Java::org.joda.time.LocalDate.parse(entitlementEffectiveDate.to_s)
           end
 
+          # conversion for billingEffectiveDate [type = org.joda.time.LocalDate]
+          if !billingEffectiveDate.nil?
+            billingEffectiveDate = Java::org.joda.time.LocalDate.parse(billingEffectiveDate.to_s)
+          end
+
+          # conversion for isMigrated [type = boolean]
+          isMigrated = isMigrated.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(isMigrated)
+
           # conversion for properties [type = java.lang.Iterable]
           tmp = java.util.ArrayList.new
           (properties || []).each do |m|
@@ -77,7 +85,7 @@ module Killbill
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.create_base_entitlement(accountId, spec, externalKey, overrides, effectiveDate, properties, context)
+            res = @real_java_api.create_base_entitlement(accountId, spec, externalKey, overrides, entitlementEffectiveDate, billingEffectiveDate, isMigrated, properties, context)
             # conversion for res [type = org.killbill.billing.entitlement.api.Entitlement]
             res = Killbill::Plugin::Model::Entitlement.new.to_ruby(res) unless res.nil?
             return res
@@ -86,8 +94,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement createBaseEntitlementWithAddOns(Java::java.util.UUID, Java::java.lang.String, Java::java.lang.Iterable, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def create_base_entitlement_with_add_ons(accountId, externalKey, entitlementSpecifier, effectiveDate, properties, context)
+        java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement createBaseEntitlementWithAddOns(Java::java.util.UUID, Java::java.lang.String, Java::java.lang.Iterable, Java::org.joda.time.LocalDate, Java::org.joda.time.LocalDate, Java::boolean, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def create_base_entitlement_with_add_ons(accountId, externalKey, entitlementSpecifier, entitlementEffectiveDate, billingEffectiveDate, isMigrated, properties, context)
 
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
@@ -104,11 +112,19 @@ module Killbill
           end
           entitlementSpecifier = tmp
 
-          # conversion for effectiveDate [type = org.joda.time.LocalDate]
-          if !effectiveDate.nil?
-            effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
+          # conversion for entitlementEffectiveDate [type = org.joda.time.LocalDate]
+          if !entitlementEffectiveDate.nil?
+            entitlementEffectiveDate = Java::org.joda.time.LocalDate.parse(entitlementEffectiveDate.to_s)
+          end
+
+          # conversion for billingEffectiveDate [type = org.joda.time.LocalDate]
+          if !billingEffectiveDate.nil?
+            billingEffectiveDate = Java::org.joda.time.LocalDate.parse(billingEffectiveDate.to_s)
           end
 
+          # conversion for isMigrated [type = boolean]
+          isMigrated = isMigrated.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(isMigrated)
+
           # conversion for properties [type = java.lang.Iterable]
           tmp = java.util.ArrayList.new
           (properties || []).each do |m|
@@ -121,7 +137,7 @@ module Killbill
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.create_base_entitlement_with_add_ons(accountId, externalKey, entitlementSpecifier, effectiveDate, properties, context)
+            res = @real_java_api.create_base_entitlement_with_add_ons(accountId, externalKey, entitlementSpecifier, entitlementEffectiveDate, billingEffectiveDate, isMigrated, properties, context)
             # conversion for res [type = org.killbill.billing.entitlement.api.Entitlement]
             res = Killbill::Plugin::Model::Entitlement.new.to_ruby(res) unless res.nil?
             return res
@@ -130,8 +146,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement addEntitlement(Java::java.util.UUID, Java::org.killbill.billing.catalog.api.PlanPhaseSpecifier, Java::java.util.List, Java::org.joda.time.LocalDate, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def add_entitlement(bundleId, spec, overrides, effectiveDate, properties, context)
+        java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement addEntitlement(Java::java.util.UUID, Java::org.killbill.billing.catalog.api.PlanPhaseSpecifier, Java::java.util.List, Java::org.joda.time.LocalDate, Java::org.joda.time.LocalDate, Java::boolean, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def add_entitlement(bundleId, spec, overrides, entitlementEffectiveDate, billingEffectiveDate, isMigrated, properties, context)
 
           # conversion for bundleId [type = java.util.UUID]
           bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
@@ -148,11 +164,19 @@ module Killbill
           end
           overrides = tmp
 
-          # conversion for effectiveDate [type = org.joda.time.LocalDate]
-          if !effectiveDate.nil?
-            effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
+          # conversion for entitlementEffectiveDate [type = org.joda.time.LocalDate]
+          if !entitlementEffectiveDate.nil?
+            entitlementEffectiveDate = Java::org.joda.time.LocalDate.parse(entitlementEffectiveDate.to_s)
+          end
+
+          # conversion for billingEffectiveDate [type = org.joda.time.LocalDate]
+          if !billingEffectiveDate.nil?
+            billingEffectiveDate = Java::org.joda.time.LocalDate.parse(billingEffectiveDate.to_s)
           end
 
+          # conversion for isMigrated [type = boolean]
+          isMigrated = isMigrated.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(isMigrated)
+
           # conversion for properties [type = java.lang.Iterable]
           tmp = java.util.ArrayList.new
           (properties || []).each do |m|
@@ -165,7 +189,7 @@ module Killbill
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.add_entitlement(bundleId, spec, overrides, effectiveDate, properties, context)
+            res = @real_java_api.add_entitlement(bundleId, spec, overrides, entitlementEffectiveDate, billingEffectiveDate, isMigrated, properties, context)
             # conversion for res [type = org.killbill.billing.entitlement.api.Entitlement]
             res = Killbill::Plugin::Model::Entitlement.new.to_ruby(res) unless res.nil?
             return res
@@ -256,72 +280,6 @@ module Killbill
           @real_java_api.resume(bundleId, effectiveDate, properties, context)
         end
 
-        java_signature 'Java::void setBlockingState(Java::java.util.UUID, Java::java.lang.String, Java::java.lang.String, Java::org.joda.time.LocalDate, Java::boolean, Java::boolean, Java::boolean, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def set_blocking_state(bundleId, stateName, serviceName, effectiveDate, blockBilling, blockEntitlement, blockChange, properties, context)
-
-          # conversion for bundleId [type = java.util.UUID]
-          bundleId = java.util.UUID.fromString(bundleId.to_s) unless bundleId.nil?
-
-          # conversion for stateName [type = java.lang.String]
-          stateName = stateName.to_s unless stateName.nil?
-
-          # conversion for serviceName [type = java.lang.String]
-          serviceName = serviceName.to_s unless serviceName.nil?
-
-          # conversion for effectiveDate [type = org.joda.time.LocalDate]
-          if !effectiveDate.nil?
-            effectiveDate = Java::org.joda.time.LocalDate.parse(effectiveDate.to_s)
-          end
-
-          # conversion for blockBilling [type = boolean]
-          blockBilling = blockBilling.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(blockBilling)
-
-          # conversion for blockEntitlement [type = boolean]
-          blockEntitlement = blockEntitlement.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(blockEntitlement)
-
-          # conversion for blockChange [type = boolean]
-          blockChange = blockChange.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(blockChange)
-
-          # conversion for properties [type = java.lang.Iterable]
-          tmp = java.util.ArrayList.new
-          (properties || []).each do |m|
-            # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
-            m = m.to_java unless m.nil?
-            tmp.add(m)
-          end
-          properties = tmp
-
-          # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
-          context = context.to_java unless context.nil?
-          @real_java_api.set_blocking_state(bundleId, stateName, serviceName, effectiveDate, blockBilling, blockEntitlement, blockChange, properties, context)
-        end
-
-        java_signature 'Java::java.lang.Iterable getBlockingStatesForServiceAndType(Java::java.util.UUID, Java::org.killbill.billing.entitlement.api.BlockingStateType, Java::java.lang.String, Java::org.killbill.billing.util.callcontext.TenantContext)'
-        def get_blocking_states_for_service_and_type(blockableId, type, serviceName, context)
-
-          # conversion for blockableId [type = java.util.UUID]
-          blockableId = java.util.UUID.fromString(blockableId.to_s) unless blockableId.nil?
-
-          # conversion for type [type = org.killbill.billing.entitlement.api.BlockingStateType]
-          type = Java::org.killbill.billing.entitlement.api.BlockingStateType.value_of( type.to_s ) unless type.nil?
-
-          # conversion for serviceName [type = java.lang.String]
-          serviceName = serviceName.to_s unless serviceName.nil?
-
-          # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
-          context = context.to_java unless context.nil?
-          res = @real_java_api.get_blocking_states_for_service_and_type(blockableId, type, serviceName, context)
-          # conversion for res [type = java.lang.Iterable]
-          tmp = []
-          (res.nil? ? [] : res.iterator).each do |m|
-            # conversion for m [type = org.killbill.billing.entitlement.api.BlockingState]
-            m = Killbill::Plugin::Model::BlockingState.new.to_ruby(m) unless m.nil?
-            tmp << m
-          end
-          res = tmp
-          return res
-        end
-
         java_signature 'Java::org.killbill.billing.entitlement.api.Entitlement getEntitlementForId(Java::java.util.UUID, Java::org.killbill.billing.util.callcontext.TenantContext)'
         def get_entitlement_for_id(id, context)