embulk 0.8.35-java → 0.10.24-java

data/embulk-core/src/main/java/org/embulk/plugin/compat/PluginWrappers.java

@@ -1,30 +0,0 @@
-package org.embulk.plugin.compat;
-
-import org.embulk.spi.InputPlugin;
-import org.embulk.spi.TransactionalFileInput;
-import org.embulk.spi.TransactionalFileOutput;
-import org.embulk.spi.TransactionalPageOutput;
-import org.embulk.plugin.compat.InputPluginWrapper;
-
-public class PluginWrappers
-{
-    public static InputPlugin inputPlugin(InputPlugin input)
-    {
-        return InputPluginWrapper.wrapIfNecessary(input);
-    }
-
-    public static TransactionalFileInput transactionalFileInput(TransactionalFileInput tran)
-    {
-        return TransactionalFileInputWrapper.wrapIfNecessary(tran);
-    }
-
-    public static TransactionalFileOutput transactionalFileOutput(TransactionalFileOutput tran)
-    {
-        return TransactionalFileOutputWrapper.wrapIfNecessary(tran);
-    }
-
-    public static TransactionalPageOutput transactionalPageOutput(TransactionalPageOutput tran)
-    {
-        return TransactionalPageOutputWrapper.wrapIfNecessary(tran);
-    }
-}

data/embulk-core/src/main/java/org/embulk/plugin/compat/TransactionalFileInputWrapper.java

@@ -1,96 +0,0 @@
-package org.embulk.plugin.compat;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import com.google.common.base.Throwables;
-import org.embulk.config.TaskReport;
-import org.embulk.config.CommitReport;
-import org.embulk.spi.Buffer;
-import org.embulk.spi.TransactionalFileInput;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TransactionalFileInputWrapper
-        implements TransactionalFileInput
-{
-    private final Logger logger = LoggerFactory.getLogger(PluginWrappers.class);
-
-    public static TransactionalFileInput wrapIfNecessary(TransactionalFileInput object)
-    {
-        Method runMethod = wrapCommitMethod(object);
-        if (runMethod != null) {
-            return new TransactionalFileInputWrapper(object, runMethod);
-        }
-        return object;
-    }
-
-    private static Method wrapCommitMethod(TransactionalFileInput object)
-    {
-        try {
-            Method m = object.getClass().getMethod("commit");
-            if (m.getReturnType().equals(CommitReport.class)) {
-                return m;
-            } else {
-                return null;
-            }
-        }
-        catch (NoSuchMethodException ex) {
-            return null;
-        }
-    }
-
-    private final TransactionalFileInput object;
-    private final Method commitMethod;
-
-    private TransactionalFileInputWrapper(TransactionalFileInput object,
-            Method commitMethod)
-    {
-        this.object = object;
-        this.commitMethod = commitMethod;
-        logger.warn("A file input plugin is compiled with old Embulk plugin API. Please update the plugin version using \"embulk gem install\" command, or contact a developer of the plugin to upgrade the plugin code using \"embulk migrate\" command: {}", object.getClass());
-    }
-
-    @Override
-    public Buffer poll()
-    {
-        return object.poll();
-    }
-
-    @Override
-    public boolean nextFile()
-    {
-        return object.nextFile();
-    }
-
-    @Override
-    public void close()
-    {
-        object.close();
-    }
-
-    @Override
-    public void abort()
-    {
-        object.abort();
-    }
-
-    @Override
-    public TaskReport commit()
-    {
-        if (commitMethod != null) {
-            try {
-                return (TaskReport) commitMethod.invoke(object);
-            }
-            catch (IllegalAccessException | IllegalArgumentException ex) {
-                throw Throwables.propagate(ex);
-            }
-            catch (InvocationTargetException ex) {
-                throw Throwables.propagate(ex.getCause());
-            }
-
-        } else {
-            return object.commit();
-        }
-    }
-}
-

data/embulk-core/src/main/java/org/embulk/plugin/compat/TransactionalFileOutputWrapper.java

@@ -1,102 +0,0 @@
-package org.embulk.plugin.compat;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import com.google.common.base.Throwables;
-import org.embulk.config.TaskReport;
-import org.embulk.config.CommitReport;
-import org.embulk.spi.Buffer;
-import org.embulk.spi.TransactionalFileOutput;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TransactionalFileOutputWrapper
-        implements TransactionalFileOutput
-{
-    private final Logger logger = LoggerFactory.getLogger(PluginWrappers.class);
-
-    public static TransactionalFileOutput wrapIfNecessary(TransactionalFileOutput object)
-    {
-        Method runMethod = wrapCommitMethod(object);
-        if (runMethod != null) {
-            return new TransactionalFileOutputWrapper(object, runMethod);
-        }
-        return object;
-    }
-
-    private static Method wrapCommitMethod(TransactionalFileOutput object)
-    {
-        try {
-            Method m = object.getClass().getMethod("commit");
-            if (m.getReturnType().equals(CommitReport.class)) {
-                return m;
-            } else {
-                return null;
-            }
-        }
-        catch (NoSuchMethodException ex) {
-            return null;
-        }
-    }
-
-    private final TransactionalFileOutput object;
-    private final Method commitMethod;
-
-    private TransactionalFileOutputWrapper(TransactionalFileOutput object,
-            Method commitMethod)
-    {
-        this.object = object;
-        this.commitMethod = commitMethod;
-        logger.warn("A file output plugin is compiled with old Embulk plugin API. Please update the plugin version using \"embulk gem install\" command, or contact a developer of the plugin to upgrade the plugin code using \"embulk migrate\" command: {}", object.getClass());
-    }
-
-    @Override
-    public void nextFile()
-    {
-        object.nextFile();
-    }
-
-    @Override
-    public void add(Buffer buffer)
-    {
-        object.add(buffer);
-    }
-
-    @Override
-    public void finish()
-    {
-        object.finish();
-    }
-
-    @Override
-    public void close()
-    {
-        object.close();
-    }
-
-    @Override
-    public void abort()
-    {
-        object.abort();
-    }
-
-    @Override
-    public TaskReport commit()
-    {
-        if (commitMethod != null) {
-            try {
-                return (TaskReport) commitMethod.invoke(object);
-            }
-            catch (IllegalAccessException | IllegalArgumentException ex) {
-                throw Throwables.propagate(ex);
-            }
-            catch (InvocationTargetException ex) {
-                throw Throwables.propagate(ex.getCause());
-            }
-
-        } else {
-            return object.commit();
-        }
-    }
-}
-

data/embulk-core/src/main/java/org/embulk/plugin/compat/TransactionalPageOutputWrapper.java

@@ -1,95 +0,0 @@
-package org.embulk.plugin.compat;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import com.google.common.base.Throwables;
-import org.embulk.config.TaskReport;
-import org.embulk.config.CommitReport;
-import org.embulk.spi.Page;
-import org.embulk.spi.TransactionalPageOutput;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TransactionalPageOutputWrapper
-        implements TransactionalPageOutput
-{
-    private final Logger logger = LoggerFactory.getLogger(PluginWrappers.class);
-
-    public static TransactionalPageOutput wrapIfNecessary(TransactionalPageOutput object)
-    {
-        Method runMethod = wrapCommitMethod(object);
-        if (runMethod != null) {
-            return new TransactionalPageOutputWrapper(object, runMethod);
-        }
-        return object;
-    }
-
-    private static Method wrapCommitMethod(TransactionalPageOutput object)
-    {
-        try {
-            Method m = object.getClass().getMethod("commit");
-            if (m.getReturnType().equals(CommitReport.class)) {
-                return m;
-            } else {
-                return null;
-            }
-        }
-        catch (NoSuchMethodException ex) {
-            return null;
-        }
-    }
-
-    private final TransactionalPageOutput object;
-    private final Method commitMethod;
-
-    private TransactionalPageOutputWrapper(TransactionalPageOutput object,
-            Method commitMethod)
-    {
-        this.object = object;
-        this.commitMethod = commitMethod;
-        logger.warn("An output plugin is compiled with old Embulk plugin API. Please update the plugin version using \"embulk gem install\" command, or contact a developer of the plugin to upgrade the plugin code using \"embulk migrate\" command: {}", object.getClass());
-    }
-
-    @Override
-    public void add(Page page)
-    {
-        object.add(page);
-    }
-
-    @Override
-    public void finish()
-    {
-        object.finish();
-    }
-
-    @Override
-    public void close()
-    {
-        object.close();
-    }
-
-    @Override
-    public void abort()
-    {
-        object.abort();
-    }
-
-    @Override
-    public TaskReport commit()
-    {
-        if (commitMethod != null) {
-            try {
-                return (TaskReport) commitMethod.invoke(object);
-            }
-            catch (IllegalAccessException | IllegalArgumentException ex) {
-                throw Throwables.propagate(ex);
-            }
-            catch (InvocationTargetException ex) {
-                throw Throwables.propagate(ex.getCause());
-            }
-
-        } else {
-            return object.commit();
-        }
-    }
-}

data/embulk-core/src/main/java/org/embulk/plugin/jar/InvalidJarPluginException.java

@@ -1,14 +0,0 @@
-package org.embulk.plugin.jar;
-
-public class InvalidJarPluginException
-        extends Exception {
-    public InvalidJarPluginException(final String message)
-    {
-        super(message);
-    }
-
-    public InvalidJarPluginException(final String message, final Throwable cause)
-    {
-        super(message, cause);
-    }
-}

data/embulk-core/src/main/java/org/embulk/plugin/jar/JarPluginLoader.java

@@ -1,205 +0,0 @@
-package org.embulk.plugin.jar;
-
-import com.google.common.collect.ImmutableList;
-import java.io.IOError;
-import java.io.IOException;
-import java.net.JarURLConnection;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.nio.file.Path;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-import org.embulk.plugin.PluginClassLoader;
-import org.embulk.plugin.PluginClassLoaderFactory;
-
-/**
- * JarPluginLoader loads a JAR-based Embulk plugin class.
- *
- * It implements {@code AutoCloseable} so that it can load the contents lazily in the future.
- * It is recommended to try-with-resources to use this class.
- */
-public class JarPluginLoader
-        implements AutoCloseable
-{
-    public static final String MANIFEST_PLUGIN_MAIN_CLASS = "Embulk-Plugin-Main-Class";
-    public static final String MANIFEST_PLUGIN_SPI_VERSION = "Embulk-Plugin-Spi-Version";
-
-    private JarPluginLoader(final Manifest pluginManifest,
-                            final Attributes pluginManifestAttributes,
-                            final Class pluginMainClass)
-    {
-        this.pluginManifest = pluginManifest;
-        this.pluginManifestAttributes = pluginManifestAttributes;
-        this.pluginMainClass = pluginMainClass;
-    }
-
-    public static JarPluginLoader load(final Path jarPath, final PluginClassLoaderFactory classLoaderFactory)
-            throws InvalidJarPluginException
-    {
-        final JarURLConnection connection = openJarURLConnection(jarPath);
-        final Manifest manifest = loadJarPluginManifest(connection, jarPath);
-        final Attributes manifestAttributes = manifest.getMainAttributes();
-        final int spiVersion = getPluginSpiVersionFromManifest(manifestAttributes);
-
-        if (spiVersion == 0) {
-            final String mainClassName = getPluginMainClassNameFromManifest(manifestAttributes);
-            final Class mainClass = loadJarPluginMainClass(jarPath, mainClassName, classLoaderFactory);
-            return new JarPluginLoader(manifest, manifestAttributes, mainClass);
-        }
-
-        throw new InvalidJarPluginException("Unknown SPI version of JAR plugin: " + spiVersion);
-    }
-
-    public Class getPluginMainClass()
-            throws InvalidJarPluginException
-    {
-        return this.pluginMainClass;
-    }
-
-    public int getPluginSpiVersion()
-            throws InvalidJarPluginException
-    {
-        return getPluginSpiVersionFromManifest(this.pluginManifestAttributes);
-    }
-
-    @Override
-    public void close()
-            throws InvalidJarPluginException
-    {
-    }
-
-    /**
-     * Opens JarURLConnection for the given JAR file path.
-     *
-     * Note that JarURLConnection does not have {@code disconnect} nor {@code close}.
-     */
-    private static JarURLConnection openJarURLConnection(final Path jarPath)
-            throws InvalidJarPluginException
-    {
-        // jar:file:/...
-        final URL jarUrl;
-        try {
-            jarUrl = new URL("jar:" + jarPath.toUri().toURL().toString() + "!/");
-        }
-        catch (MalformedURLException ex) {
-            throw new InvalidJarPluginException("JAR plugin path specified is invalid: " + jarPath.toString(), ex);
-        }
-
-        try {
-            return (JarURLConnection) jarUrl.openConnection();
-        }
-        catch (IOException ex) {
-            throw new InvalidJarPluginException("JAR plugin specified is formatted wrongly: " + jarPath.toString(), ex);
-        }
-    }
-
-    private static Manifest loadJarPluginManifest(final JarURLConnection connection, final Path jarPath)
-            throws InvalidJarPluginException
-    {
-        try {
-            return connection.getManifest();
-        }
-        catch (IOException ex) {
-            throw new InvalidJarPluginException("Manifest in JAR plugin specified is invalid: " + jarPath.toString(),
-                                                ex);
-        }
-    }
-
-    private static Class loadJarPluginMainClass(final Path jarPath,
-                                                final String pluginMainClassName,
-                                                final PluginClassLoaderFactory pluginClassLoaderFactory)
-            throws InvalidJarPluginException
-    {
-        final URI fileUriJar;
-        try {
-            fileUriJar = jarPath.toUri();
-        }
-        catch (IOError ex) {
-            throw new InvalidJarPluginException("[FATAL] JAR plugin path specified is invalid: " + jarPath.toString(),
-                                                ex);
-        }
-        catch (SecurityException ex) {
-            throw new InvalidJarPluginException("Security manager prohibits getting the working directory: " +
-                                                jarPath.toString() +
-                                                ". Specifying an absolute path for JAR plugin may solve this.",
-                                                ex);
-        }
-
-        // file:/...
-        final URL fileUrlJar;
-        try {
-            fileUrlJar = fileUriJar.toURL();
-        }
-        catch (IllegalArgumentException ex) {
-            throw new InvalidJarPluginException("[FATAL/INTERNAL] JAR plugin path as URI is not absolute.", ex);
-        }
-        catch (MalformedURLException ex) {
-            throw new InvalidJarPluginException("JAR plugin path specified is invalid: " + jarPath.toString(), ex);
-        }
-
-
-        final PluginClassLoader pluginClassLoader =
-            pluginClassLoaderFactory.create(ImmutableList.of(fileUrlJar), JarPluginLoader.class.getClassLoader());
-
-        final Class pluginMainClass;
-        try {
-            pluginMainClass = pluginClassLoader.loadClass(pluginMainClassName);
-        }
-        catch (ClassNotFoundException ex) {
-            throw new InvalidJarPluginException("Class " + pluginMainClassName + " not found in " + jarPath.toString(),
-                                                ex);
-        }
-
-        return pluginMainClass;
-    }
-
-    private static int getPluginSpiVersionFromManifest(final Attributes manifestAttributes)
-            throws InvalidJarPluginException
-    {
-        final String spiVersionString = getAttributeFromManifest(manifestAttributes, MANIFEST_PLUGIN_SPI_VERSION);
-
-        if (spiVersionString == null) {
-            throw new InvalidJarPluginException("SPI version of JAR plugin is not specified.");
-        }
-
-        try {
-            return Integer.parseInt(spiVersionString);
-        }
-        catch (NumberFormatException ex) {
-            throw new InvalidJarPluginException("SPI version of JAR plugin is not an integer: \"" +
-                                                spiVersionString +
-                                                "\"", ex);
-        }
-    }
-
-    private static String getPluginMainClassNameFromManifest(final Attributes manifestAttributes)
-            throws InvalidJarPluginException
-    {
-        final String pluginMainClassName = getAttributeFromManifest(manifestAttributes, MANIFEST_PLUGIN_MAIN_CLASS);
-
-        if (pluginMainClassName == null) {
-            throw new InvalidJarPluginException("Main class name of JAR plugin is not specified.");
-        }
-
-        return pluginMainClassName;
-    }
-
-    private static String getAttributeFromManifest(final Attributes manifestAttributes, final String attributeName)
-            throws InvalidJarPluginException
-    {
-        try {
-            return manifestAttributes.getValue(attributeName);
-        }
-        catch (IllegalArgumentException ex) {
-            throw new InvalidJarPluginException("[FATAL/INTERNAL] " +
-                                                attributeName +
-                                                " is considered invalid as a manifest attribute.",
-                                                ex);
-        }
-    }
-
-    private final Manifest pluginManifest;
-    private final Attributes pluginManifestAttributes;
-    private final Class pluginMainClass;
-}