killbill 3.2.4 → 4.0.0

data/generators/active_merchant/templates/lib/plugin.rb

@@ -22,4 +22,3 @@ require '<%= identifier %>/private_api'
 require '<%= identifier %>/models/payment_method'
 require '<%= identifier %>/models/response'
 require '<%= identifier %>/models/transaction'
-

data/generators/active_merchant/templates/plugin.gemspec.rb

@@ -12,38 +12,40 @@ Gem::Specification.new do |s|
 
   s.author   = 'Kill Bill core team'
   s.email    = 'killbilling-users@googlegroups.com'
-  s.homepage = 'http://kill-bill.org'
+  s.homepage = 'http://killbill.io'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.bindir        = 'bin'
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 3.2.0'
-  s.add_dependency 'activemerchant', '~> 1.44.1'
-  s.add_dependency 'offsite_payments', '~> 2.0.1'
-  s.add_dependency 'activerecord', '~> 4.1.0'
-  s.add_dependency 'actionpack', '~> 4.1.0'
-  s.add_dependency 'actionview', '~> 4.1.0'
-  s.add_dependency 'activesupport', '~> 4.1.0'
-  s.add_dependency 'money', '~> 6.1.1'
-  s.add_dependency 'monetize', '~> 0.3.0'
+  s.add_dependency 'killbill', '~> 4.0.0'
+
   s.add_dependency 'sinatra', '~> 1.3.4'
   s.add_dependency 'thread_safe', '~> 0.3.4'
+  s.add_dependency 'activerecord', '~> 4.1.0'
   if defined?(JRUBY_VERSION)
-    s.add_dependency 'activerecord-jdbcmysql-adapter', '~> 1.3.7'
+    s.add_dependency 'activerecord-bogacs', '~> 0.3'
+    s.add_dependency 'activerecord-jdbc-adapter', '~> 1.3'
     # Required to avoid errors like java.lang.NoClassDefFoundError: org/bouncycastle/asn1/DERBoolean
-    s.add_dependency 'jruby-openssl', '~> 0.9.4'
+    s.add_dependency 'jruby-openssl', '~> 0.9.6'
   end
+  s.add_dependency 'actionpack', '~> 4.1.0'
+  s.add_dependency 'actionview', '~> 4.1.0'
+  s.add_dependency 'activemerchant', '~> 1.48.0'
+  s.add_dependency 'offsite_payments', '~> 2.1.0'
+  s.add_dependency 'monetize', '~> 1.1.0'
+  s.add_dependency 'money', '~> 6.5.1'
 
-  s.add_development_dependency 'jbundler', '~> 0.4.1'
+  s.add_development_dependency 'jbundler', '~> 0.4.3'
   s.add_development_dependency 'rake', '>= 10.0.0'
   s.add_development_dependency 'rspec', '~> 2.12.0'
   if defined?(JRUBY_VERSION)
-    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.3.7'
+    s.add_development_dependency 'jdbc-sqlite3', '~> 3.7'
+    s.add_development_dependency 'jdbc-mariadb', '~> 1.1'
   else
     s.add_development_dependency 'sqlite3', '~> 1.3.7'
   end

data/generators/active_merchant/templates/pom.xml.rb

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-~ Copyright 2014 The Billing Project, LLC
+~ Copyright 2015 The Billing Project, LLC
 ~
 ~  The Billing Project licenses this file to you under the Apache License, version 2.0
 ~  (the "License"); you may not use this file except in compliance with the

data/generators/active_merchant/templates/release.sh.rb

@@ -1,5 +1,8 @@
 set -e
 
+BUNDLE=${BUNDLE-"bundle exec"}
+MVN=${MVN-"mvn"}
+
 if [ 'GNU' != "$(tar --help | grep GNU | head -1 | awk '{print $1}')" ]; then
   echo 'Unable to release: make sure to use GNU tar'
   exit 1
@@ -14,28 +17,45 @@ else
 fi
 
 VERSION=`grep -E '<version>([0-9]+\.[0-9]+\.[0-9]+)</version>' pom.xml | sed 's/[\t \n]*<version>\(.*\)<\/version>[\t \n]*/\1/'`
-if [ "$VERSION" != "$(cat $PWD/VERSION)" ]; then
+if [[ -z "$NO_RELEASE" && "$VERSION" != "$(cat $PWD/VERSION)" ]]; then
   echo 'Unable to release: make sure the versions in pom.xml and VERSION match'
   exit 1
 fi
 
 echo 'Cleaning up'
-rake killbill:clean ; rake build
+$BUNDLE rake killbill:clean
+
+echo 'Building gem'
+$BUNDLE rake build
 
-echo 'Pushing the gem to Rubygems'
-rake release
+if [[ -z "$NO_RELEASE" ]]; then
+  echo 'Pushing the gem to Rubygems'
+  $BUNDLE rake release
+fi
 
 echo 'Building artifact'
-rake killbill:package
+$BUNDLE rake killbill:package
 
 ARTIFACT="$PWD/pkg/killbill-<%= identifier %>-$VERSION.tar.gz"
 echo "Pushing $ARTIFACT to Maven Central"
-mvn gpg:sign-and-deploy-file \
-    -DgroupId=org.kill-bill.billing.plugin.ruby \
-    -DartifactId=<%= identifier %>-plugin \
-    -Dversion=$VERSION \
-    -Dpackaging=tar.gz \
-    -DrepositoryId=ossrh-releases \
-    -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ \
-    -Dfile=$ARTIFACT \
-    -DpomFile=pom.xml
+
+if [[ -z "$NO_RELEASE" ]]; then
+  GOAL=gpg:sign-and-deploy-file
+  REPOSITORY_ID=ossrh-releases
+  URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
+else
+  GOAL=deploy:deploy-file
+  REPOSITORY_ID=sonatype-nexus-snapshots
+  URL=https://oss.sonatype.org/content/repositories/snapshots/
+  VERSION="$VERSION-SNAPSHOT"
+fi
+
+$MVN $GOAL \
+     -DgroupId=org.kill-bill.billing.plugin.ruby \
+     -DartifactId=<%= identifier %>-plugin \
+     -Dversion=$VERSION \
+     -Dpackaging=tar.gz \
+     -DrepositoryId=$REPOSITORY_ID \
+     -Durl=$URL \
+     -Dfile=$ARTIFACT \
+     -DpomFile=pom.xml

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

@@ -1,9 +1,12 @@
 require 'spec_helper'
 
 describe Killbill::<%= class_name %>::PaymentPlugin do
+
+  include ::Killbill::Plugin::ActiveMerchant::RSpec
+
   before(:each) do
     Dir.mktmpdir do |dir|
-      file = File.new(File.join(dir, '<%= identifier %>.yml'), "w+")
+      file = File.new(File.join(dir, '<%= identifier %>.yml'), 'w+')
       file.write(<<-eos)
 :<%= identifier %>:
   :test: true
@@ -14,12 +17,7 @@ describe Killbill::<%= class_name %>::PaymentPlugin do
       eos
       file.close
 
-      @plugin              = Killbill::<%= class_name %>::PaymentPlugin.new
-      @plugin.logger       = Logger.new(STDOUT)
-      @plugin.logger.level = Logger::INFO
-      @plugin.conf_dir     = File.dirname(file)
-      @plugin.kb_apis      = Killbill::Plugin::KillbillApi.new('<%= identifier %>', {})
-      @plugin.root         = '/foo/killbill-<%= identifier %>/0.0.1'
+      @plugin = build_plugin(::Killbill::<%= class_name %>::PaymentPlugin, '<%= identifier %>', File.dirname(file))
 
       # Start the plugin here - since the config file will be deleted
       @plugin.start_plugin

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

@@ -7,26 +7,15 @@ describe Killbill::<%= class_name %>::PaymentPlugin do
   include ::Killbill::Plugin::ActiveMerchant::RSpec
 
   before(:each) do
-    @plugin = Killbill::<%= class_name %>::PaymentPlugin.new
-
-    @account_api    = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaUserAccountApi.new
-    @payment_api    = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaPaymentApi.new
-    @tenant_api     = ::Killbill::Plugin::ActiveMerchant::RSpec::FakeJavaTenantUserApi.new({})
-
-    svcs            = {:account_user_api => @account_api, :payment_api => @payment_api, :tenant_user_api => @tenant_api}
-    @plugin.kb_apis = Killbill::Plugin::KillbillApi.new('<%= identifier %>', svcs)
-
-    @call_context           = ::Killbill::Plugin::Model::CallContext.new
-    @call_context.tenant_id = '00000011-0022-0033-0044-000000000055'
-    @call_context           = @call_context.to_ruby(@call_context)
-
-    @plugin.logger       = Logger.new(STDOUT)
-    @plugin.logger.level = Logger::INFO
-    @plugin.conf_dir     = File.expand_path(File.dirname(__FILE__) + '../../../../')
-    @plugin.root         = '/foo/killbill-<%= identifier %>/0.0.1'
+    ::Killbill::<%= class_name %>::<%= class_name %>PaymentMethod.delete_all
+    ::Killbill::<%= class_name %>::<%= class_name %>Response.delete_all
+    ::Killbill::<%= class_name %>::<%= class_name %>Transaction.delete_all
 
+    @plugin = build_plugin(::Killbill::<%= class_name %>::PaymentPlugin, '<%= identifier %>')
     @plugin.start_plugin
 
+    @call_context = build_call_context
+
     @properties = []
     @pm         = create_payment_method(::Killbill::<%= class_name %>::<%= class_name %>PaymentMethod, nil, @call_context.tenant_id, @properties)
     @amount     = BigDecimal.new('100')
@@ -34,7 +23,7 @@ describe Killbill::<%= class_name %>::PaymentPlugin do
 
     kb_payment_id = SecureRandom.uuid
     1.upto(6) do
-      @kb_payment = @payment_api.add_payment(kb_payment_id)
+      @kb_payment = @plugin.kb_apis.proxied_services[:payment_api].add_payment(kb_payment_id)
     end
   end
 

data/killbill.gemspec

@@ -12,39 +12,45 @@ Gem::Specification.new do |s|
 
   s.author   = 'Kill Bill core team'
   s.email    = 'killbilling-users@googlegroups.com'
-  s.homepage = 'http://kill-bill.org'
+  s.homepage = 'http://killbill.io'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.bindir        = 'bin'
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
   s.rdoc_options << '--exclude' << '.'
 
   s.add_dependency 'sinatra', '~> 1.3.4'
+  s.add_dependency 'rack', '>= 1.5.2'
   s.add_dependency 'typhoeus', '~> 0.6.9'
-  s.add_dependency 'tzinfo', '~> 1.1.0'
-
-  s.add_development_dependency 'activerecord', '~> 4.1.0'
+  s.add_dependency 'tzinfo', '~> 1.2.0'
+  # semi-optional:
   s.add_development_dependency 'thread_safe', '~> 0.3.4'
+  s.add_development_dependency 'activerecord', '~> 4.1.0'
   if defined?(JRUBY_VERSION)
-    s.add_development_dependency 'activerecord-jdbcmysql-adapter', '~> 1.3.7'
-    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.3.7'
-  else
-    s.add_development_dependency 'sqlite3', '~> 1.3.7'
+    s.add_development_dependency 'activerecord-bogacs', '~> 0.3'
+    # 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'
   end
   s.add_development_dependency 'actionpack', '~> 4.1.0'
   s.add_development_dependency 'actionview', '~> 4.1.0'
-  s.add_development_dependency 'activemerchant', '~> 1.44.1'
-  s.add_development_dependency 'offsite_payments', '~> 2.0.1'
-  s.add_development_dependency 'monetize', '~> 0.3.0'
-  s.add_development_dependency 'money', '~> 6.1.1'
+  s.add_development_dependency 'activemerchant', '~> 1.48.0'
+  s.add_development_dependency 'offsite_payments', '~> 2.1.0'
+  s.add_development_dependency 'monetize', '~> 1.1.0'
+  s.add_development_dependency 'money', '~> 6.5.1'
+  # testing/development :
   s.add_development_dependency 'jbundler', '~> 0.4.3'
-  s.add_development_dependency 'rack', '>= 1.5.2'
-  s.add_development_dependency 'rake', '>= 0.8.7'
+  s.add_development_dependency 'rake', '>= 10.0.0'
   s.add_development_dependency 'rspec', '~> 2.12.0'
   s.add_development_dependency 'thor', '~> 0.19.1'
+  if defined?(JRUBY_VERSION)
+    s.add_development_dependency 'jdbc-sqlite3', '~> 3.7'
+  else
+    s.add_development_dependency 'sqlite3', '~> 1.3.7'
+  end
 
   s.requirements << "jar 'org.kill-bill.billing:killbill-api'"
   # For testing only

data/lib/killbill/ext/active_merchant/typhoeus_connection.rb

@@ -1,11 +1,10 @@
 require 'benchmark'
-require 'active_utils/common/error'
-require 'active_utils/common/network_connection_retries'
-require 'active_utils/common/connection'
+require 'openssl' # active_utils internals assume OpenSSL loaded
+require 'active_merchant'
 require 'typhoeus'
 
 module ActiveMerchant
-  class Connection
+  Connection.class_eval do # force auto-load (loads network_connection_retries)
 
     def request(method, body, headers = {})
       request_start = Time.now.to_f

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

@@ -71,7 +71,7 @@ module Killbill
           @bill_cycle_day_local = @bill_cycle_day_local
 
           # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
-          @currency = Java::org.killbill.billing.catalog.api.Currency.value_of("#{@currency.to_s}") unless @currency.nil?
+          @currency = Java::org.killbill.billing.catalog.api.Currency.value_of( @currency.to_s ) unless @currency.nil?
 
           # conversion for payment_method_id [type = java.util.UUID]
           @payment_method_id = java.util.UUID.fromString(@payment_method_id.to_s) unless @payment_method_id.nil?

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

@@ -56,7 +56,7 @@ module Killbill
           @bill_cycle_day_local = @bill_cycle_day_local
 
           # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
-          @currency = Java::org.killbill.billing.catalog.api.Currency.value_of("#{@currency.to_s}") unless @currency.nil?
+          @currency = Java::org.killbill.billing.catalog.api.Currency.value_of( @currency.to_s ) unless @currency.nil?
 
           # conversion for payment_method_id [type = java.util.UUID]
           @payment_method_id = java.util.UUID.fromString(@payment_method_id.to_s) unless @payment_method_id.nil?

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

@@ -59,10 +59,10 @@ module Killbill
           @audited_entity_id = java.util.UUID.fromString(@audited_entity_id.to_s) unless @audited_entity_id.nil?
 
           # conversion for audited_object_type [type = org.killbill.billing.ObjectType]
-          @audited_object_type = Java::org.killbill.billing.ObjectType.value_of("#{@audited_object_type.to_s}") unless @audited_object_type.nil?
+          @audited_object_type = Java::org.killbill.billing.ObjectType.value_of( @audited_object_type.to_s ) unless @audited_object_type.nil?
 
           # conversion for change_type [type = org.killbill.billing.util.audit.ChangeType]
-          @change_type = Java::org.killbill.billing.util.audit.ChangeType.value_of("#{@change_type.to_s}") unless @change_type.nil?
+          @change_type = Java::org.killbill.billing.util.audit.ChangeType.value_of( @change_type.to_s ) unless @change_type.nil?
 
           # conversion for user_name [type = java.lang.String]
           @user_name = @user_name.to_s unless @user_name.nil?

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

@@ -46,7 +46,7 @@ module Killbill
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
 
           # conversion for auditLevel [type = org.killbill.billing.util.api.AuditLevel]
-          auditLevel = Java::org.killbill.billing.util.api.AuditLevel.value_of("#{auditLevel.to_s}") unless auditLevel.nil?
+          auditLevel = Java::org.killbill.billing.util.api.AuditLevel.value_of( auditLevel.to_s ) unless auditLevel.nil?
 
           # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
@@ -63,10 +63,10 @@ module Killbill
           objectId = java.util.UUID.fromString(objectId.to_s) unless objectId.nil?
 
           # conversion for objectType [type = org.killbill.billing.ObjectType]
-          objectType = Java::org.killbill.billing.ObjectType.value_of("#{objectType.to_s}") unless objectType.nil?
+          objectType = Java::org.killbill.billing.ObjectType.value_of( objectType.to_s ) unless objectType.nil?
 
           # conversion for auditLevel [type = org.killbill.billing.util.api.AuditLevel]
-          auditLevel = Java::org.killbill.billing.util.api.AuditLevel.value_of("#{auditLevel.to_s}") unless auditLevel.nil?
+          auditLevel = Java::org.killbill.billing.util.api.AuditLevel.value_of( auditLevel.to_s ) unless auditLevel.nil?
 
           # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?

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

@@ -41,7 +41,7 @@ module Killbill
 
         def to_java()
           # conversion for type [type = org.killbill.billing.catalog.api.BlockType]
-          @type = Java::org.killbill.billing.catalog.api.BlockType.value_of("#{@type.to_s}") unless @type.nil?
+          @type = Java::org.killbill.billing.catalog.api.BlockType.value_of( @type.to_s ) unless @type.nil?
 
           # conversion for unit [type = org.killbill.billing.catalog.api.Unit]
           @unit = @unit.to_java unless @unit.nil?

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

@@ -62,7 +62,7 @@ module Killbill
           @state_name = @state_name.to_s unless @state_name.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?
+          @type = Java::org.killbill.billing.entitlement.api.BlockingStateType.value_of( @type.to_s ) unless @type.nil?
 
           # conversion for effective_date [type = org.joda.time.DateTime]
           if !@effective_date.nil?

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

@@ -50,10 +50,10 @@ module Killbill
           @user_name = @user_name.to_s unless @user_name.nil?
 
           # conversion for call_origin [type = org.killbill.billing.util.callcontext.CallOrigin]
-          @call_origin = Java::org.killbill.billing.util.callcontext.CallOrigin.value_of("#{@call_origin.to_s}") unless @call_origin.nil?
+          @call_origin = Java::org.killbill.billing.util.callcontext.CallOrigin.value_of( @call_origin.to_s ) unless @call_origin.nil?
 
           # conversion for user_type [type = org.killbill.billing.util.callcontext.UserType]
-          @user_type = Java::org.killbill.billing.util.callcontext.UserType.value_of("#{@user_type.to_s}") unless @user_type.nil?
+          @user_type = Java::org.killbill.billing.util.callcontext.UserType.value_of( @user_type.to_s ) unless @user_type.nil?
 
           # conversion for reason_code [type = java.lang.String]
           @reason_code = @reason_code.to_s unless @reason_code.nil?

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

@@ -44,7 +44,7 @@ module Killbill
           @tag_definition_id = java.util.UUID.fromString(@tag_definition_id.to_s) unless @tag_definition_id.nil?
 
           # conversion for object_type [type = org.killbill.billing.ObjectType]
-          @object_type = Java::org.killbill.billing.ObjectType.value_of("#{@object_type.to_s}") unless @object_type.nil?
+          @object_type = Java::org.killbill.billing.ObjectType.value_of( @object_type.to_s ) unless @object_type.nil?
 
           # conversion for object_id [type = java.util.UUID]
           @object_id = java.util.UUID.fromString(@object_id.to_s) unless @object_id.nil?
@@ -65,7 +65,7 @@ module Killbill
           end
 
           # conversion for control_tag_type [type = org.killbill.billing.util.tag.ControlTagType]
-          @control_tag_type = Java::org.killbill.billing.util.tag.ControlTagType.value_of("#{@control_tag_type.to_s}") unless @control_tag_type.nil?
+          @control_tag_type = Java::org.killbill.billing.util.tag.ControlTagType.value_of( @control_tag_type.to_s ) unless @control_tag_type.nil?
           self
         end
 

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

@@ -41,7 +41,7 @@ module Killbill
 
         def to_java()
           # conversion for base_currency [type = org.killbill.billing.catalog.api.Currency]
-          @base_currency = Java::org.killbill.billing.catalog.api.Currency.value_of("#{@base_currency.to_s}") unless @base_currency.nil?
+          @base_currency = Java::org.killbill.billing.catalog.api.Currency.value_of( @base_currency.to_s ) unless @base_currency.nil?
 
           # conversion for rates [type = java.util.Set]
           tmp = java.util.TreeSet.new

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

@@ -61,7 +61,7 @@ module Killbill
       def get_current_currency_conversion(baseCurrency)
 
         # conversion for baseCurrency [type = org.killbill.billing.catalog.api.Currency]
-        baseCurrency = Java::org.killbill.billing.catalog.api.Currency.value_of("#{baseCurrency.to_s}") unless baseCurrency.nil?
+        baseCurrency = Java::org.killbill.billing.catalog.api.Currency.value_of( baseCurrency.to_s ) unless baseCurrency.nil?
         begin
           res = @real_java_api.get_current_currency_conversion(baseCurrency)
           # conversion for res [type = org.killbill.billing.currency.api.CurrencyConversion]
@@ -76,7 +76,7 @@ module Killbill
       def get_currency_conversion(baseCurrency, dateConversion)
 
         # conversion for baseCurrency [type = org.killbill.billing.catalog.api.Currency]
-        baseCurrency = Java::org.killbill.billing.catalog.api.Currency.value_of("#{baseCurrency.to_s}") unless baseCurrency.nil?
+        baseCurrency = Java::org.killbill.billing.catalog.api.Currency.value_of( baseCurrency.to_s ) unless baseCurrency.nil?
 
         # conversion for dateConversion [type = org.joda.time.DateTime]
         if !dateConversion.nil?

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

@@ -59,7 +59,7 @@ module Killbill
           @object_id = java.util.UUID.fromString(@object_id.to_s) unless @object_id.nil?
 
           # conversion for object_type [type = org.killbill.billing.ObjectType]
-          @object_type = Java::org.killbill.billing.ObjectType.value_of("#{@object_type.to_s}") unless @object_type.nil?
+          @object_type = Java::org.killbill.billing.ObjectType.value_of( @object_type.to_s ) unless @object_type.nil?
 
           # conversion for field_name [type = java.lang.String]
           @field_name = @field_name.to_s unless @field_name.nil?

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

@@ -117,7 +117,7 @@ module Killbill
           objectId = java.util.UUID.fromString(objectId.to_s) unless objectId.nil?
 
           # conversion for objectType [type = org.killbill.billing.ObjectType]
-          objectType = Java::org.killbill.billing.ObjectType.value_of("#{objectType.to_s}") unless objectType.nil?
+          objectType = Java::org.killbill.billing.ObjectType.value_of( objectType.to_s ) unless objectType.nil?
 
           # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
@@ -140,7 +140,7 @@ module Killbill
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
 
           # conversion for objectType [type = org.killbill.billing.ObjectType]
-          objectType = Java::org.killbill.billing.ObjectType.value_of("#{objectType.to_s}") unless objectType.nil?
+          objectType = Java::org.killbill.billing.ObjectType.value_of( objectType.to_s ) unless objectType.nil?
 
           # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?