embulk 0.7.2 → 0.7.3

data/lib/embulk/input_plugin.rb

@@ -38,83 +38,81 @@ module Embulk
       raise NotImplementedError, "InputPlugin#run must be implemented"
     end
 
-    if Embulk.java?
-      def self.new_java
-        JavaAdapter.new(self)
-      end
+    def self.new_java
+      JavaAdapter.new(self)
+    end
 
-      class JavaAdapter
-        include Java::InputPlugin
+    class JavaAdapter
+      include Java::InputPlugin
 
-        def initialize(ruby_class)
-          @ruby_class = ruby_class
-        end
+      def initialize(ruby_class)
+        @ruby_class = ruby_class
+      end
 
-        def transaction(java_config, java_control)
-          config = DataSource.from_java(java_config)
-          config_diff_hash = @ruby_class.transaction(config) do |task_source_hash,columns,task_count|
-            java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
-            java_schema = Schema.new(columns).to_java
-            java_task_reports = java_control.run(java_task_source, java_schema, task_count)
-            java_task_reports.map {|java_task_report|
-              DataSource.from_java(java_task_report)
-            }
-          end
-          # TODO check return type of #transaction
-          return DataSource.from_ruby_hash(config_diff_hash).to_java
+      def transaction(java_config, java_control)
+        config = DataSource.from_java(java_config)
+        config_diff_hash = @ruby_class.transaction(config) do |task_source_hash,columns,task_count|
+          java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
+          java_schema = Schema.new(columns).to_java
+          java_task_reports = java_control.run(java_task_source, java_schema, task_count)
+          java_task_reports.map {|java_task_report|
+            DataSource.from_java(java_task_report)
+          }
         end
+        # TODO check return type of #transaction
+        return DataSource.from_ruby_hash(config_diff_hash).to_java
+      end
 
-        def resume(java_task_source, java_schema, task_count, java_control)
-          task_source = DataSource.from_java(java_task_source)
-          schema = Schema.from_java(java_schema)
-          config_diff_hash = @ruby_class.resume(task_source, schema, task_count) do |task_source_hash,columns,task_count|
-            java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
-            java_schema = Schema.new(columns).to_java
-            java_task_reports = java_control.run(java_task_source, java_schema, task_count)
-            java_task_reports.map {|java_task_report|
-              DataSource.from_java(java_task_report)
-            }
-          end
-          # TODO check return type of #resume
-          return DataSource.from_ruby_hash(config_diff_hash).to_java
+      def resume(java_task_source, java_schema, task_count, java_control)
+        task_source = DataSource.from_java(java_task_source)
+        schema = Schema.from_java(java_schema)
+        config_diff_hash = @ruby_class.resume(task_source, schema, task_count) do |task_source_hash,columns,task_count|
+          java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
+          java_schema = Schema.new(columns).to_java
+          java_task_reports = java_control.run(java_task_source, java_schema, task_count)
+          java_task_reports.map {|java_task_report|
+            DataSource.from_java(java_task_report)
+          }
         end
+        # TODO check return type of #resume
+        return DataSource.from_ruby_hash(config_diff_hash).to_java
+      end
 
-        def cleanup(java_task_source, java_schema, task_count, java_task_reports)
-          task_source = DataSource.from_java(java_task_source)
-          schema = Schema.from_java(java_schema)
-          task_reports = java_task_reports.map {|c| DataSource.from_java(c) }
-          @ruby_class.cleanup(task_source, schema, task_count, task_reports)
-          return nil
-        end
+      def cleanup(java_task_source, java_schema, task_count, java_task_reports)
+        task_source = DataSource.from_java(java_task_source)
+        schema = Schema.from_java(java_schema)
+        task_reports = java_task_reports.map {|c| DataSource.from_java(c) }
+        @ruby_class.cleanup(task_source, schema, task_count, task_reports)
+        return nil
+      end
 
-        def guess(java_config)
-          config = DataSource.from_java(java_config)
-          config_diff_hash = @ruby_class.guess(config)
-          return DataSource.from_ruby_hash(config_diff_hash).to_java
-        end
+      def guess(java_config)
+        config = DataSource.from_java(java_config)
+        config_diff_hash = @ruby_class.guess(config)
+        return DataSource.from_ruby_hash(config_diff_hash).to_java
+      end
 
-        def run(java_task_source, java_schema, processor_index, java_output)
-          task_source = DataSource.from_java(java_task_source)
-          schema = Schema.from_java(java_schema)
-          page_builder = PageBuilder.new(schema, java_output)
-          begin
-            task_report_hash = @ruby_class.new(task_source, schema, processor_index, page_builder).run
-            return DataSource.from_ruby_hash(task_report_hash).to_java
-          ensure
-            page_builder.close
-          end
+      def run(java_task_source, java_schema, processor_index, java_output)
+        task_source = DataSource.from_java(java_task_source)
+        schema = Schema.from_java(java_schema)
+        page_builder = PageBuilder.new(schema, java_output)
+        begin
+          task_report_hash = @ruby_class.new(task_source, schema, processor_index, page_builder).run
+          return DataSource.from_ruby_hash(task_report_hash).to_java
+        ensure
+          page_builder.close
         end
       end
+    end
 
-      def self.from_java(java_class)
-        JavaPlugin.ruby_adapter_class(java_class, InputPlugin, RubyAdapter)
-      end
+    def self.from_java(java_class)
+      JavaPlugin.ruby_adapter_class(java_class, InputPlugin, RubyAdapter)
+    end
 
-      module RubyAdapter
-        module ClassMethods
-        end
-        # TODO
+    module RubyAdapter
+      module ClassMethods
       end
+      # TODO
     end
   end
 

data/lib/embulk/output_plugin.rb

@@ -47,103 +47,101 @@ module Embulk
       {}
     end
 
-    if Embulk.java?
-      def self.new_java
-        JavaAdapter.new(self)
-      end
+    def self.new_java
+      JavaAdapter.new(self)
+    end
 
-      class JavaAdapter
-        include Java::OutputPlugin
+    class JavaAdapter
+      include Java::OutputPlugin
 
-        def initialize(ruby_class)
-          @ruby_class = ruby_class
-        end
+      def initialize(ruby_class)
+        @ruby_class = ruby_class
+      end
 
-        def transaction(java_config, java_schema, task_count, java_control)
-          config = DataSource.from_java(java_config)
-          schema = Schema.from_java(java_schema)
-          config_diff_hash = @ruby_class.transaction(config, schema, task_count) do |task_source_hash|
-            java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
-            java_task_reports = java_control.run(java_task_source)
-            java_task_reports.map {|java_task_report|
-              DataSource.from_java(java_task_report)
-            }
-          end
-          # TODO check return type of #transaction
-          return DataSource.from_ruby_hash(config_diff_hash).to_java
+      def transaction(java_config, java_schema, task_count, java_control)
+        config = DataSource.from_java(java_config)
+        schema = Schema.from_java(java_schema)
+        config_diff_hash = @ruby_class.transaction(config, schema, task_count) do |task_source_hash|
+          java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
+          java_task_reports = java_control.run(java_task_source)
+          java_task_reports.map {|java_task_report|
+            DataSource.from_java(java_task_report)
+          }
         end
+        # TODO check return type of #transaction
+        return DataSource.from_ruby_hash(config_diff_hash).to_java
+      end
 
-        def resume(java_task_source, java_schema, task_count, java_control)
-          task_source = DataSource.from_java(java_task_source)
-          schema = Schema.from_java(java_schema)
-          config_diff_hash = @ruby_class.resume(task_source, schema, task_count) do |task_source_hash,columns,task_count|
-            java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
-            java_task_reports = java_control.run(java_task_source)
-            java_task_reports.map {|java_task_report|
-              DataSource.from_java(java_task_report)
-            }
-          end
-          # TODO check return type of #resume
-          return DataSource.from_ruby_hash(config_diff_hash).to_java
+      def resume(java_task_source, java_schema, task_count, java_control)
+        task_source = DataSource.from_java(java_task_source)
+        schema = Schema.from_java(java_schema)
+        config_diff_hash = @ruby_class.resume(task_source, schema, task_count) do |task_source_hash,columns,task_count|
+          java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
+          java_task_reports = java_control.run(java_task_source)
+          java_task_reports.map {|java_task_report|
+            DataSource.from_java(java_task_report)
+          }
         end
+        # TODO check return type of #resume
+        return DataSource.from_ruby_hash(config_diff_hash).to_java
+      end
 
-        def cleanup(java_task_source, java_schema, task_count, java_task_reports)
-          task_source = DataSource.from_java(java_task_source)
-          schema = Schema.from_java(java_schema)
-          task_reports = java_task_reports.map {|c| DataSource.from_java(c) }
-          @ruby_class.cleanup(task_source, schema, task_count, task_reports)
-          return nil
-        end
+      def cleanup(java_task_source, java_schema, task_count, java_task_reports)
+        task_source = DataSource.from_java(java_task_source)
+        schema = Schema.from_java(java_schema)
+        task_reports = java_task_reports.map {|c| DataSource.from_java(c) }
+        @ruby_class.cleanup(task_source, schema, task_count, task_reports)
+        return nil
+      end
 
-        def open(java_task_source, java_schema, processor_index)
-          task_source = DataSource.from_java(java_task_source)
-          schema = Schema.from_java(java_schema)
-          ruby_object = @ruby_class.new(task_source, schema, processor_index)
-          return OutputAdapter.new(ruby_object, schema)
-        end
+      def open(java_task_source, java_schema, processor_index)
+        task_source = DataSource.from_java(java_task_source)
+        schema = Schema.from_java(java_schema)
+        ruby_object = @ruby_class.new(task_source, schema, processor_index)
+        return OutputAdapter.new(ruby_object, schema)
+      end
 
-        class OutputAdapter
-          include Java::TransactionalPageOutput
+      class OutputAdapter
+        include Java::TransactionalPageOutput
 
-          def initialize(ruby_object, schema)
-            @ruby_object = ruby_object
-            @schema = schema
-          end
+        def initialize(ruby_object, schema)
+          @ruby_object = ruby_object
+          @schema = schema
+        end
 
-          def add(java_page)
-            # TODO reuse page reader
-            @ruby_object.add Page.new(java_page, @schema)
-          end
+        def add(java_page)
+          # TODO reuse page reader
+          @ruby_object.add Page.new(java_page, @schema)
+        end
 
-          def finish
-            @ruby_object.finish
-          end
+        def finish
+          @ruby_object.finish
+        end
 
-          def close
-            @ruby_object.close
-          end
+        def close
+          @ruby_object.close
+        end
 
-          def abort
-            @ruby_object.abort
-          end
+        def abort
+          @ruby_object.abort
+        end
 
-          def commit
-            task_report_hash = @ruby_object.commit
-            return DataSource.from_ruby_hash(task_report_hash).to_java
-          end
+        def commit
+          task_report_hash = @ruby_object.commit
+          return DataSource.from_ruby_hash(task_report_hash).to_java
         end
       end
+    end
 
-      def self.from_java(java_class)
-        JavaPlugin.ruby_adapter_class(java_class, OutputPlugin, RubyAdapter)
-      end
+    def self.from_java(java_class)
+      JavaPlugin.ruby_adapter_class(java_class, OutputPlugin, RubyAdapter)
+    end
 
-      module RubyAdapter
-        module ClassMethods
-          # TODO transaction, resume, cleanup
-        end
-        # TODO add, finish, close, abort, commit
+    module RubyAdapter
+      module ClassMethods
+        # TODO transaction, resume, cleanup
       end
+      # TODO add, finish, close, abort, commit
     end
   end
 

data/lib/embulk/parser_plugin.rb

@@ -26,52 +26,50 @@ module Embulk
       raise NotImplementedError, "ParserPlugin#run(file_input) must be implemented"
     end
 
-    if Embulk.java?
-      def self.new_java
-        JavaAdapter.new(self)
-      end
+    def self.new_java
+      JavaAdapter.new(self)
+    end
 
-      class JavaAdapter
-        include Java::ParserPlugin
+    class JavaAdapter
+      include Java::ParserPlugin
 
-        def initialize(ruby_class)
-          @ruby_class = ruby_class
-        end
+      def initialize(ruby_class)
+        @ruby_class = ruby_class
+      end
 
-        def transaction(java_config, java_control)
-          config = DataSource.from_java(java_config)
-          @ruby_class.transaction(config) do |task_source_hash,columns|
-            java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
-            java_schema = Schema.new(columns).to_java
-            java_control.run(java_task_source, java_schema)
-          end
-          nil
+      def transaction(java_config, java_control)
+        config = DataSource.from_java(java_config)
+        @ruby_class.transaction(config) do |task_source_hash,columns|
+          java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
+          java_schema = Schema.new(columns).to_java
+          java_control.run(java_task_source, java_schema)
         end
+        nil
+      end
 
-        def run(java_task_source, java_schema, java_file_input, java_output)
-          task_source = DataSource.from_java(java_task_source)
-          schema = Schema.from_java(java_schema)
-          file_input = FileInput.new(java_file_input)
-          page_builder = PageBuilder.new(schema, java_output)
-          begin
-            @ruby_class.new(task_source, schema, page_builder).run(file_input)
-            nil
-          ensure
-            page_builder.close
-            # FileInput is closed by FileInputRunner
-          end
+      def run(java_task_source, java_schema, java_file_input, java_output)
+        task_source = DataSource.from_java(java_task_source)
+        schema = Schema.from_java(java_schema)
+        file_input = FileInput.new(java_file_input)
+        page_builder = PageBuilder.new(schema, java_output)
+        begin
+          @ruby_class.new(task_source, schema, page_builder).run(file_input)
+          nil
+        ensure
+          page_builder.close
+          # FileInput is closed by FileInputRunner
         end
       end
+    end
 
-      def self.from_java(java_class)
-        JavaPlugin.ruby_adapter_class(java_class, ParserPlugin, RubyAdapter)
-      end
+    def self.from_java(java_class)
+      JavaPlugin.ruby_adapter_class(java_class, ParserPlugin, RubyAdapter)
+    end
 
-      module RubyAdapter
-        module ClassMethods
-        end
-        # TODO
+    module RubyAdapter
+      module ClassMethods
       end
+      # TODO
     end
   end
 

data/lib/embulk/plugin.rb

@@ -14,8 +14,8 @@ module Embulk
   require 'embulk/encoder_plugin'
   require 'embulk/guess_plugin'
   require 'embulk/executor_plugin'
-  require 'embulk/java_plugin' if Embulk.java?
-  require 'embulk/exec' if Embulk.java?
+  require 'embulk/java_plugin'
+  require 'embulk/exec'
 
   class PluginManager
     def initialize

data/lib/embulk/schema.rb

@@ -88,15 +88,13 @@ module Embulk
       @record_writer.call(page_builder, record)
     end
 
-    if Embulk.java?
-      def self.from_java(java_schema)
-        new java_schema.getColumns.map {|column| Column.from_java(column) }
-      end
+    def self.from_java(java_schema)
+      new java_schema.getColumns.map {|column| Column.from_java(column) }
+    end
 
-      def to_java
-        columns = self.map {|column| column.to_java }
-        Java::Schema.new(columns)
-      end
+    def to_java
+      columns = self.map {|column| column.to_java }
+      Java::Schema.new(columns)
     end
   end
 

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end