embulk 0.3.2 → 0.4.0

data/embulk-core/src/main/java/org/embulk/plugin/InjectedPluginSource.java

@@ -46,6 +46,7 @@ public class InjectedPluginSource
     {
         String name = type.getName();
         try {
+            @SuppressWarnings("unchecked")
             PluginFactory<T> factory = (PluginFactory<T>) injector.getInstance(
                     Key.get(PluginFactory.class, pluginFactoryName(iface, name)));
             return factory.newPlugin(injector);
@@ -60,6 +61,7 @@ public class InjectedPluginSource
         if (FileInputPlugin.class.isAssignableFrom(impl)) {
             Preconditions.checkArgument(InputPlugin.class.equals(iface));
             factory = new PluginFactory<T>() {
+                @SuppressWarnings("unchecked")
                 public T newPlugin(Injector injector)
                 {
                     return (T) new FileInputRunner((FileInputPlugin) injector.getInstance(impl));
@@ -68,6 +70,7 @@ public class InjectedPluginSource
         } else if (FileOutputPlugin.class.isAssignableFrom(impl)) {
             Preconditions.checkArgument(OutputPlugin.class.equals(iface));
             factory = new PluginFactory<T>() {
+                @SuppressWarnings("unchecked")
                 public T newPlugin(Injector injector)
                 {
                     return (T) new FileOutputRunner((FileOutputPlugin) injector.getInstance(impl));
@@ -76,6 +79,7 @@ public class InjectedPluginSource
         } else {
             Preconditions.checkArgument(iface.isAssignableFrom(impl));
             factory = new PluginFactory<T>() {
+                @SuppressWarnings("unchecked")
                 public T newPlugin(Injector injector)
                 {
                     return (T) injector.getInstance(impl);

data/embulk-core/src/main/java/org/embulk/plugin/PluginManager.java

@@ -2,6 +2,7 @@ package org.embulk.plugin;
 
 import java.util.Set;
 import java.util.List;
+import java.util.ArrayList;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
@@ -23,12 +24,26 @@ public class PluginManager
 
     public <T> T newPlugin(Class<T> iface, PluginType type)
     {
+        if (sources.isEmpty()) {
+            throw new ConfigException("No PluginSource is installed");
+        }
+
+        List<Throwable> causes = new ArrayList<Throwable>();
         for (PluginSource source : sources) {
             try {
                 return source.newPlugin(iface, type);
             } catch (PluginSourceNotMatchException e) {
+                if (e.getCause() != null) {
+                    causes.add(e.getCause());
+                }
             }
         }
-        throw new ConfigException("Plugin not found");  // TODO exception message should include type in original format
+
+        ConfigException e = new ConfigException(String.format("%s '%s' is not found",
+                    iface.getSimpleName(), type.getName()), causes.remove(causes.size()-1));
+        for (Throwable cause : causes) {
+            e.addSuppressed(cause);
+        }
+        throw e;
     }
 }

data/embulk-core/src/main/java/org/embulk/spi/Column.java

@@ -45,7 +45,7 @@ public class Column
         return type;
     }
 
-    public void visit(SchemaVisitor visitor)
+    public void visit(ColumnVisitor visitor)
     {
         if (type instanceof BooleanType) {
             visitor.booleanColumn(this);

data/embulk-core/src/main/java/org/embulk/spi/{SchemaVisitor.java → ColumnVisitor.java}

@@ -1,6 +1,6 @@
 package org.embulk.spi;
 
-public interface SchemaVisitor
+public interface ColumnVisitor
 {
     public void booleanColumn(Column column);
 

data/embulk-core/src/main/java/org/embulk/spi/Exec.java

@@ -3,7 +3,7 @@ package org.embulk.spi;
 import org.slf4j.Logger;
 import org.embulk.config.Task;
 import org.embulk.config.CommitReport;
-import org.embulk.config.NextConfig;
+import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.TaskSource;
 import org.embulk.plugin.PluginType;
@@ -59,9 +59,9 @@ public class Exec
         return session().newCommitReport();
     }
 
-    public static NextConfig newNextConfig()
+    public static ConfigDiff newConfigDiff()
     {
-        return session().newNextConfig();
+        return session().newConfigDiff();
     }
 
     public static ConfigSource newConfigSource()

data/embulk-core/src/main/java/org/embulk/spi/ExecSession.java

@@ -10,7 +10,7 @@ import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ModelManager;
 import org.embulk.config.CommitReport;
-import org.embulk.config.NextConfig;
+import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.TaskSource;
 import org.embulk.config.DataSourceImpl;
@@ -111,7 +111,7 @@ public class ExecSession
         return new DataSourceImpl(modelManager);
     }
 
-    public NextConfig newNextConfig()
+    public ConfigDiff newConfigDiff()
     {
         return new DataSourceImpl(modelManager);
     }

data/embulk-core/src/main/java/org/embulk/spi/FileInputPlugin.java

@@ -3,7 +3,7 @@ package org.embulk.spi;
 import java.util.List;
 import org.embulk.config.TaskSource;
 import org.embulk.config.ConfigSource;
-import org.embulk.config.NextConfig;
+import org.embulk.config.ConfigDiff;
 import org.embulk.config.CommitReport;
 
 public interface FileInputPlugin
@@ -14,10 +14,10 @@ public interface FileInputPlugin
                 int processorCount);
     }
 
-    public NextConfig transaction(ConfigSource config,
+    public ConfigDiff transaction(ConfigSource config,
             FileInputPlugin.Control control);
 
-    public NextConfig resume(TaskSource taskSource,
+    public ConfigDiff resume(TaskSource taskSource,
             int processorCount,
             FileInputPlugin.Control control);
 

data/embulk-core/src/main/java/org/embulk/spi/FileInputRunner.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.embulk.config.Task;
 import org.embulk.config.TaskSource;
 import org.embulk.config.ConfigSource;
-import org.embulk.config.NextConfig;
+import org.embulk.config.ConfigDiff;
 import org.embulk.config.CommitReport;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
@@ -54,13 +54,13 @@ public class FileInputRunner
     }
 
     @Override
-    public NextConfig transaction(ConfigSource config, final InputPlugin.Control control)
+    public ConfigDiff transaction(ConfigSource config, final InputPlugin.Control control)
     {
         final RunnerTask task = config.loadConfig(RunnerTask.class);
         return fileInputPlugin.transaction(config, new RunnerControl(task, control));
     }
 
-    public NextConfig resume(TaskSource taskSource,
+    public ConfigDiff resume(TaskSource taskSource,
             Schema schema, int processorCount,
             InputPlugin.Control control)
     {

data/embulk-core/src/main/java/org/embulk/spi/FileOutputPlugin.java

@@ -3,7 +3,7 @@ package org.embulk.spi;
 import java.util.List;
 import org.embulk.config.TaskSource;
 import org.embulk.config.ConfigSource;
-import org.embulk.config.NextConfig;
+import org.embulk.config.ConfigDiff;
 import org.embulk.config.CommitReport;
 
 public interface FileOutputPlugin
@@ -13,10 +13,10 @@ public interface FileOutputPlugin
         public List<CommitReport> run(TaskSource taskSource);
     }
 
-    public NextConfig transaction(ConfigSource config, int processorCount,
+    public ConfigDiff transaction(ConfigSource config, int processorCount,
             FileOutputPlugin.Control control);
 
-    public NextConfig resume(TaskSource taskSource,
+    public ConfigDiff resume(TaskSource taskSource,
             int processorCount,
             FileOutputPlugin.Control control);
 

data/embulk-core/src/main/java/org/embulk/spi/FileOutputRunner.java

@@ -5,7 +5,7 @@ import java.util.ArrayList;
 import org.embulk.config.Task;
 import org.embulk.config.TaskSource;
 import org.embulk.config.ConfigSource;
-import org.embulk.config.NextConfig;
+import org.embulk.config.ConfigDiff;
 import org.embulk.config.CommitReport;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
@@ -55,7 +55,7 @@ public class FileOutputRunner
     }
 
     @Override
-    public NextConfig transaction(ConfigSource config,
+    public ConfigDiff transaction(ConfigSource config,
             final Schema schema, final int processorCount,
             final OutputPlugin.Control control)
     {
@@ -63,7 +63,7 @@ public class FileOutputRunner
         return fileOutputPlugin.transaction(config, processorCount, new RunnerControl(schema, task, control));
     }
 
-    public NextConfig resume(TaskSource taskSource,
+    public ConfigDiff resume(TaskSource taskSource,
             Schema schema, int processorCount,
             final OutputPlugin.Control control)
     {

data/embulk-core/src/main/java/org/embulk/spi/FilterPlugin.java

@@ -3,7 +3,7 @@ package org.embulk.spi;
 import java.util.List;
 import org.embulk.config.TaskSource;
 import org.embulk.config.ConfigSource;
-import org.embulk.config.NextConfig;
+import org.embulk.config.ConfigDiff;
 import org.embulk.config.CommitReport;
 
 public interface FilterPlugin

data/embulk-core/src/main/java/org/embulk/spi/GuessPlugin.java

@@ -1,9 +1,9 @@
 package org.embulk.spi;
 
-import org.embulk.config.NextConfig;
+import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigSource;
 
 public interface GuessPlugin
 {
-    public NextConfig guess(ConfigSource config, Buffer sample);
+    public ConfigDiff guess(ConfigSource config, Buffer sample);
 }

data/embulk-core/src/main/java/org/embulk/spi/InputPlugin.java

@@ -3,7 +3,7 @@ package org.embulk.spi;
 import java.util.List;
 import org.embulk.config.TaskSource;
 import org.embulk.config.ConfigSource;
-import org.embulk.config.NextConfig;
+import org.embulk.config.ConfigDiff;
 import org.embulk.config.CommitReport;
 
 public interface InputPlugin
@@ -14,10 +14,10 @@ public interface InputPlugin
                 Schema schema, int processorCount);
     }
 
-    public NextConfig transaction(ConfigSource config,
+    public ConfigDiff transaction(ConfigSource config,
             InputPlugin.Control control);
 
-    public NextConfig resume(TaskSource taskSource,
+    public ConfigDiff resume(TaskSource taskSource,
             Schema schema, int processorCount,
             InputPlugin.Control control);
 

data/embulk-core/src/main/java/org/embulk/spi/OutputPlugin.java

@@ -3,7 +3,7 @@ package org.embulk.spi;
 import java.util.List;
 import org.embulk.config.TaskSource;
 import org.embulk.config.ConfigSource;
-import org.embulk.config.NextConfig;
+import org.embulk.config.ConfigDiff;
 import org.embulk.config.CommitReport;
 
 public interface OutputPlugin
@@ -13,11 +13,11 @@ public interface OutputPlugin
         public List<CommitReport> run(TaskSource taskSource);
     }
 
-    public NextConfig transaction(ConfigSource config,
+    public ConfigDiff transaction(ConfigSource config,
             Schema schema, int processorCount,
             OutputPlugin.Control control);
 
-    public NextConfig resume(TaskSource taskSource,
+    public ConfigDiff resume(TaskSource taskSource,
             Schema schema, int processorCount,
             OutputPlugin.Control control);
 

data/embulk-core/src/main/java/org/embulk/spi/PluginClassLoader.java

@@ -0,0 +1,80 @@
+package org.embulk.spi;
+
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
+import org.jruby.Ruby;
+
+public class PluginClassLoader
+        extends URLClassLoader
+{
+    private static final String[] PARENT_FIRST_PACKAGES = new String[] {
+        "org.embulk.",
+        "io.airlift.slice.",
+        "com.fasterxml.jackson.",
+        "com.google.inject.",
+        "org.jruby.",
+        "javax.inject.",
+        "java.",
+    };
+
+    public PluginClassLoader(Ruby pluginJRubyRuntime, List<URL> urls)
+    {
+        this(urls, pluginJRubyRuntime.getJRubyClassLoader());
+    }
+
+    public PluginClassLoader(List<URL> urls, ClassLoader parent)
+    {
+        super(urls.toArray(new URL[urls.size()]), parent);
+    }
+
+    @Override
+    protected Class<?> loadClass(String name, boolean resolve)
+            throws ClassNotFoundException
+    {
+        synchronized (getClassLoadingLock(name)) {
+            Class<?> loadedClass = findLoadedClass(name);
+            if (loadedClass != null) {
+                return resolveClass(loadedClass, resolve);
+            }
+
+            boolean parentFirst = isInParentFirstPackage(name);
+            if (!parentFirst) {
+                try {
+                    return resolveClass(findClass(name), resolve);
+                } catch (ClassNotFoundException ignored) {
+                }
+            }
+
+            try {
+                return resolveClass(getParent().loadClass(name), resolve);
+            } catch (ClassNotFoundException ignored) {
+            }
+
+            if (parentFirst) {
+                return resolveClass(findClass(name), resolve);
+            }
+
+            throw new ClassNotFoundException(name);
+        }
+    }
+
+    private Class<?> resolveClass(Class<?> clazz, boolean resolve)
+    {
+        if (resolve) {
+            resolveClass(clazz);
+        }
+        return clazz;
+    }
+
+    private boolean isInParentFirstPackage(String name)
+    {
+        for (String pkg : PARENT_FIRST_PACKAGES) {
+            if (name.startsWith(pkg)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

data/embulk-core/src/main/java/org/embulk/spi/Schema.java

@@ -42,7 +42,7 @@ public class Schema
         return getColumn(index).getType();
     }
 
-    public void visitColumns(SchemaVisitor visitor)
+    public void visitColumns(ColumnVisitor visitor)
     {
         for (Column column : columns) {
             column.visit(visitor);

data/embulk-core/src/main/java/org/embulk/spi/time/TimestampFormatter.java

@@ -5,9 +5,9 @@ import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.jruby.embed.ScriptingContainer;
 import org.jruby.util.RubyDateFormat;
-import com.fasterxml.jackson.annotation.JacksonInject;
 import org.embulk.config.Task;
 import org.embulk.config.Config;
+import org.embulk.config.ConfigInject;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigException;
 import org.embulk.spi.util.LineEncoder;
@@ -21,7 +21,7 @@ public class TimestampFormatter
         @ConfigDefault("\"UTC\"")
         public DateTimeZone getTimeZone();
 
-        @JacksonInject
+        @ConfigInject
         public ScriptingContainer getJRuby();
     }
 

data/embulk-core/src/main/java/org/embulk/spi/time/TimestampParser.java

@@ -2,9 +2,9 @@ package org.embulk.spi.time;
 
 import org.joda.time.DateTimeZone;
 import org.jruby.embed.ScriptingContainer;
-import com.fasterxml.jackson.annotation.JacksonInject;
 import org.embulk.config.Task;
 import org.embulk.config.Config;
+import org.embulk.config.ConfigInject;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigException;
 import static org.embulk.spi.time.TimestampFormat.parseDateTimeZone;
@@ -18,7 +18,7 @@ public class TimestampParser
         @ConfigDefault("\"UTC\"")
         public DateTimeZone getDefaultTimeZone();
 
-        @JacksonInject
+        @ConfigInject
         public ScriptingContainer getJRuby();
     }
 

data/embulk-core/src/main/java/org/embulk/spi/util/Filters.java

@@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableList;
 import org.embulk.config.TaskSource;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.CommitReport;
-import org.embulk.config.NextConfig;
+import org.embulk.config.ConfigDiff;
 import org.embulk.plugin.PluginType;
 import org.embulk.spi.ExecSession;
 import org.embulk.spi.Schema;

data/embulk-core/src/main/java/org/embulk/spi/util/LineEncoder.java

@@ -6,9 +6,9 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CodingErrorAction;
-import com.fasterxml.jackson.annotation.JacksonInject;
 import org.embulk.config.Task;
 import org.embulk.config.Config;
+import org.embulk.config.ConfigInject;
 import org.embulk.config.ConfigDefault;
 import org.embulk.spi.FileOutput;
 import org.embulk.spi.BufferAllocator;
@@ -29,7 +29,7 @@ public class LineEncoder
         @ConfigDefault("\"CRLF\"")
         public Newline getNewline();
 
-        @JacksonInject
+        @ConfigInject
         public BufferAllocator getBufferAllocator();
     }