killbill 1.8.4 → 1.9.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dd98bf7051bb9ee2e80fd56b975fc167e6110de0
+  data.tar.gz: eb4e505e25f5ef14e7e078c4b2f3cc89709dadf6
+SHA512:
+  metadata.gz: e416f13e53d9640a38d98fd3280f26709f7d556e0b892d257b6354119715e04666fc44a4f267db89b5d4212107ad6c06f4e4420ae824227be3fa4463bf16e0ff
+  data.tar.gz: 5ff5c09dcedb2a66cd4a1eb1046360290682b43c9333e19a2b1aff06e44cd01a6ec3b5b9ab084c6cc8392ab0f895f8e9a550e8dbd896d31034e9099b066d11c2

data/Jarfile

@@ -1,6 +1,6 @@
-jar 'com.ning.billing:killbill-api', '0.7.6'
-jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.6.1'
-jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.6.1'
-jar 'com.ning.billing.plugin:killbill-plugin-api-currency', '0.6.1'
+jar 'com.ning.billing:killbill-api', '0.7.8'
+jar 'com.ning.billing.plugin:killbill-plugin-api-notification', '0.6.2'
+jar 'com.ning.billing.plugin:killbill-plugin-api-payment', '0.6.2'
+jar 'com.ning.billing.plugin:killbill-plugin-api-currency', '0.6.2'
 jar 'com.ning.billing:killbill-util:tests', '0.7.0'
 jar 'javax.servlet:javax.servlet-api', '3.0.1'

data/NEWS

@@ -1,5 +1,8 @@
+1.9.0
+    Regenerate files for killbill-api 0.7.8 and killbill-plugin-api 0.6.2
+
 1.8.4
-   Regenerate models to export refund status
+    Regenerate models to export refund status
 
 1.8.3
     Regenerate models for currency conversion api changes

data/VERSION

@@ -1 +1 @@
-1.8.4
+1.9.0

data/gen_config/api.conf

@@ -32,6 +32,7 @@ com.ning.billing.usage,
 com.ning.billing.usage.api,
 com.ning.billing.util,
 com.ning.billing.util.api,
+com.ning.billing.util.audit,
 com.ning.billing.util.callcontext,
 com.ning.billing.util.customfield,
 com.ning.billing.util.entity,

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

@@ -122,7 +122,7 @@ module Killbill
           # conversion for created_date [type = org.joda.time.DateTime]
           @created_date = j_obj.created_date
           if !@created_date.nil?
-            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
             str = fmt.print(@created_date)
             @created_date = DateTime.iso8601(str)
           end
@@ -130,7 +130,7 @@ module Killbill
           # conversion for updated_date [type = org.joda.time.DateTime]
           @updated_date = j_obj.updated_date
           if !@updated_date.nil?
-            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
             str = fmt.print(@updated_date)
             @updated_date = DateTime.iso8601(str)
           end

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

@@ -0,0 +1,303 @@
+###################################################################################
+#                                                                                 #
+#                   Copyright 2010-2013 Ning, Inc.                                #
+#                                                                                 #
+#      Ning 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   #
+#      License.  You may obtain a copy of the License at:                         #
+#                                                                                 #
+#          http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                                 #
+#      Unless required by applicable law or agreed to in writing, software        #
+#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT  #
+#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the  #
+#      License for the specific language governing permissions and limitations    #
+#      under the License.                                                         #
+#                                                                                 #
+###################################################################################
+
+
+#
+#                       DO NOT EDIT!!!
+#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
+#
+
+
+module Killbill
+  module Plugin
+    module Model
+
+      java_package 'com.ning.billing.util.audit'
+      class AccountAuditLogs
+
+        include com.ning.billing.util.audit.AccountAuditLogs
+
+        attr_accessor :audit_logs_for_account, :audit_logs_for_bundle, :audit_logs_for_subscription, :audit_logs_for_subscription_event, :audit_logs_for_blocking_state, :audit_logs_for_invoice, :audit_logs_for_invoice_item, :audit_logs_for_invoice_payment, :audit_logs_for_payment, :audit_logs_for_refund, :audit_logs_for_chargeback, :audit_logs_for_tag, :audit_logs_for_custom_field, :audit_logs
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for audit_logs_for_account [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs_for_account || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs_for_account = tmp
+
+          # conversion for audit_logs_for_bundle [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs_for_bundle || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs_for_bundle = tmp
+
+          # conversion for audit_logs_for_subscription [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs_for_subscription || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs_for_subscription = tmp
+
+          # conversion for audit_logs_for_subscription_event [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs_for_subscription_event || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs_for_subscription_event = tmp
+
+          # conversion for audit_logs_for_blocking_state [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs_for_blocking_state || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs_for_blocking_state = tmp
+
+          # conversion for audit_logs_for_invoice [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs_for_invoice || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs_for_invoice = tmp
+
+          # conversion for audit_logs_for_invoice_item [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs_for_invoice_item || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs_for_invoice_item = tmp
+
+          # conversion for audit_logs_for_invoice_payment [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs_for_invoice_payment || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs_for_invoice_payment = tmp
+
+          # conversion for audit_logs_for_payment [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs_for_payment || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs_for_payment = tmp
+
+          # conversion for audit_logs_for_refund [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs_for_refund || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs_for_refund = tmp
+
+          # conversion for audit_logs_for_chargeback [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs_for_chargeback || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs_for_chargeback = tmp
+
+          # conversion for audit_logs_for_tag [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs_for_tag || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs_for_tag = tmp
+
+          # conversion for audit_logs_for_custom_field [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs_for_custom_field || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs_for_custom_field = tmp
+
+          # conversion for audit_logs [type = com.ning.billing.util.audit.AccountAuditLogsForObjectType]
+          @audit_logs = @audit_logs.to_java unless @audit_logs.nil?
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for audit_logs_for_account [type = java.util.List]
+          @audit_logs_for_account = j_obj.audit_logs_for_account
+          tmp = []
+          (@audit_logs_for_account || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs_for_account = tmp
+
+          # conversion for audit_logs_for_bundle [type = java.util.List]
+          @audit_logs_for_bundle = j_obj.audit_logs_for_bundle
+          tmp = []
+          (@audit_logs_for_bundle || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs_for_bundle = tmp
+
+          # conversion for audit_logs_for_subscription [type = java.util.List]
+          @audit_logs_for_subscription = j_obj.audit_logs_for_subscription
+          tmp = []
+          (@audit_logs_for_subscription || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs_for_subscription = tmp
+
+          # conversion for audit_logs_for_subscription_event [type = java.util.List]
+          @audit_logs_for_subscription_event = j_obj.audit_logs_for_subscription_event
+          tmp = []
+          (@audit_logs_for_subscription_event || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs_for_subscription_event = tmp
+
+          # conversion for audit_logs_for_blocking_state [type = java.util.List]
+          @audit_logs_for_blocking_state = j_obj.audit_logs_for_blocking_state
+          tmp = []
+          (@audit_logs_for_blocking_state || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs_for_blocking_state = tmp
+
+          # conversion for audit_logs_for_invoice [type = java.util.List]
+          @audit_logs_for_invoice = j_obj.audit_logs_for_invoice
+          tmp = []
+          (@audit_logs_for_invoice || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs_for_invoice = tmp
+
+          # conversion for audit_logs_for_invoice_item [type = java.util.List]
+          @audit_logs_for_invoice_item = j_obj.audit_logs_for_invoice_item
+          tmp = []
+          (@audit_logs_for_invoice_item || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs_for_invoice_item = tmp
+
+          # conversion for audit_logs_for_invoice_payment [type = java.util.List]
+          @audit_logs_for_invoice_payment = j_obj.audit_logs_for_invoice_payment
+          tmp = []
+          (@audit_logs_for_invoice_payment || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs_for_invoice_payment = tmp
+
+          # conversion for audit_logs_for_payment [type = java.util.List]
+          @audit_logs_for_payment = j_obj.audit_logs_for_payment
+          tmp = []
+          (@audit_logs_for_payment || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs_for_payment = tmp
+
+          # conversion for audit_logs_for_refund [type = java.util.List]
+          @audit_logs_for_refund = j_obj.audit_logs_for_refund
+          tmp = []
+          (@audit_logs_for_refund || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs_for_refund = tmp
+
+          # conversion for audit_logs_for_chargeback [type = java.util.List]
+          @audit_logs_for_chargeback = j_obj.audit_logs_for_chargeback
+          tmp = []
+          (@audit_logs_for_chargeback || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs_for_chargeback = tmp
+
+          # conversion for audit_logs_for_tag [type = java.util.List]
+          @audit_logs_for_tag = j_obj.audit_logs_for_tag
+          tmp = []
+          (@audit_logs_for_tag || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs_for_tag = tmp
+
+          # conversion for audit_logs_for_custom_field [type = java.util.List]
+          @audit_logs_for_custom_field = j_obj.audit_logs_for_custom_field
+          tmp = []
+          (@audit_logs_for_custom_field || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs_for_custom_field = tmp
+
+          # conversion for audit_logs [type = com.ning.billing.util.audit.AccountAuditLogsForObjectType]
+          @audit_logs = j_obj.audit_logs
+          @audit_logs = Killbill::Plugin::Model::AccountAuditLogsForObjectType.new.to_ruby(@audit_logs) unless @audit_logs.nil?
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,68 @@
+###################################################################################
+#                                                                                 #
+#                   Copyright 2010-2013 Ning, Inc.                                #
+#                                                                                 #
+#      Ning 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   #
+#      License.  You may obtain a copy of the License at:                         #
+#                                                                                 #
+#          http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                                 #
+#      Unless required by applicable law or agreed to in writing, software        #
+#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT  #
+#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the  #
+#      License for the specific language governing permissions and limitations    #
+#      under the License.                                                         #
+#                                                                                 #
+###################################################################################
+
+
+#
+#                       DO NOT EDIT!!!
+#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
+#
+
+
+module Killbill
+  module Plugin
+    module Model
+
+      java_package 'com.ning.billing.util.audit'
+      class AccountAuditLogsForObjectType
+
+        include com.ning.billing.util.audit.AccountAuditLogsForObjectType
+
+        attr_accessor :audit_logs
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for audit_logs [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@audit_logs || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @audit_logs = tmp
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for audit_logs [type = java.util.List]
+          @audit_logs = j_obj.audit_logs
+          tmp = []
+          (@audit_logs || []).each do |m|
+            # conversion for m [type = com.ning.billing.util.audit.AuditLog]
+            m = Killbill::Plugin::Model::AuditLog.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @audit_logs = tmp
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -69,7 +69,7 @@ module Killbill
           # conversion for created_date [type = org.joda.time.DateTime]
           @created_date = j_obj.created_date
           if !@created_date.nil?
-            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
             str = fmt.print(@created_date)
             @created_date = DateTime.iso8601(str)
           end
@@ -77,7 +77,7 @@ module Killbill
           # conversion for updated_date [type = org.joda.time.DateTime]
           @updated_date = j_obj.updated_date
           if !@updated_date.nil?
-            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
             str = fmt.print(@updated_date)
             @updated_date = DateTime.iso8601(str)
           end