embulk-output-oracle 0.4.1 → 0.4.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-oracle
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -19,7 +19,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- lib/embulk/linux_x64/libembulk-output-oracle.so
 - lib/embulk/output/oracle.rb
 - lib/embulk/win_x64/embulk-output-oracle.dll
 - src/main/cpp/common/dir-path-load.cpp
@@ -51,13 +50,12 @@ files:
 - src/test/java/org/embulk/input/filesplit/LocalFileSplitInputPlugin.java
 - src/test/java/org/embulk/input/filesplit/PartialFile.java
 - src/test/java/org/embulk/input/filesplit/PartialFileInputStream.java
-- src/test/java/org/embulk/output/oracle/ChildFirstClassLoader.java
-- src/test/java/org/embulk/output/oracle/EmbulkPluginTester.java
-- src/test/java/org/embulk/output/oracle/EmptyConfigSource.java
 - src/test/java/org/embulk/output/oracle/OracleOutputPluginTest.java
 - src/test/java/org/embulk/output/oracle/OracleOutputPluginTestImpl.java
 - src/test/java/org/embulk/output/oracle/TimestampFormatTest.java
+- src/test/java/org/embulk/output/tester/EmbulkPluginTester.java
 - src/test/resources/data/test1/test1.csv
+- src/test/resources/dummy.txt
 - src/test/resources/yml/test-insert-direct-direct-method.yml
 - src/test/resources/yml/test-insert-direct-empty.yml
 - src/test/resources/yml/test-insert-direct-oci-method-split.yml
@@ -71,8 +69,8 @@ files:
 - src/test/resources/yml/test-replace.yml
 - src/test/resources/yml/test-string-timestamp.yml
 - src/test/resources/yml/test-url.yml
-- classpath/embulk-output-jdbc-0.4.1.jar
-- classpath/embulk-output-oracle-0.4.1.jar
+- classpath/embulk-output-jdbc-0.4.2.jar
+- classpath/embulk-output-oracle-0.4.2.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0

data/src/test/java/org/embulk/output/oracle/ChildFirstClassLoader.java

@@ -1,42 +0,0 @@
-package org.embulk.output.oracle;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.List;
-
-public class ChildFirstClassLoader
-        extends URLClassLoader
-{
-    public ChildFirstClassLoader(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);
-            }
-
-            try {
-                return resolveClass(findClass(name), resolve);
-            } catch (ClassNotFoundException ignored) {
-            }
-
-            return super.loadClass(name, resolve);
-        }
-    }
-
-    private Class<?> resolveClass(Class<?> clazz, boolean resolve)
-    {
-        if (resolve) {
-            resolveClass(clazz);
-        }
-        return clazz;
-    }
-
-}

data/src/test/java/org/embulk/output/oracle/EmbulkPluginTester.java

@@ -1,124 +0,0 @@
-package org.embulk.output.oracle;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.embulk.EmbulkService;
-import org.embulk.config.ConfigLoader;
-import org.embulk.config.ConfigSource;
-import org.embulk.exec.ExecutionResult;
-import org.embulk.exec.BulkLoader;
-import org.embulk.plugin.InjectedPluginSource;
-import org.embulk.spi.ExecSession;
-
-import com.google.inject.Binder;
-import com.google.inject.Injector;
-import com.google.inject.Module;
-
-public class EmbulkPluginTester
-{
-    private static class PluginDefinition
-    {
-        public final Class<?> iface;
-        public final String name;
-        public final Class<?> impl;
-
-
-        public PluginDefinition(Class<?> iface, String name, Class<?> impl)
-        {
-            this.iface = iface;
-            this.name = name;
-            this.impl = impl;
-        }
-
-    }
-
-    private final List<PluginDefinition> plugins = new ArrayList<PluginDefinition>();
-
-
-
-    public EmbulkPluginTester()
-    {
-    }
-
-    public EmbulkPluginTester(Class<?> iface, String name, Class<?> impl)
-    {
-        addPlugin(iface, name, impl);
-    }
-
-    public void addPlugin(Class<?> iface, String name, Class<?> impl)
-    {
-        plugins.add(new PluginDefinition(iface, name, impl));
-    }
-
-    public void run(String ymlPath) throws Exception
-    {
-        EmbulkService service = new EmbulkService(new EmptyConfigSource()) {
-            protected Iterable<? extends Module> getAdditionalModules(ConfigSource systemConfig)
-            {
-                return Arrays.asList(new Module()
-                {
-                    @Override
-                    public void configure(Binder binder)
-                    {
-                        for (PluginDefinition plugin : plugins) {
-                            InjectedPluginSource.registerPluginTo(binder, plugin.iface, plugin.name, plugin.impl);
-                        }
-                    }
-                });
-            }
-        };
-        Injector injector = service.getInjector();
-        ConfigSource config = injector.getInstance(ConfigLoader.class).fromYamlFile(new File(ymlPath));
-        ExecSession session = ExecSession.builder(injector).fromExecConfig(config).build();
-        try {
-            BulkLoader loader = injector.getInstance(BulkLoader.class);
-            ExecutionResult result = loader.run(session, config);
-        } finally {
-            session.cleanup();
-        }
-    }
-
-    private File convert(String yml) {
-        try {
-            File rootPath = new File(EmbulkPluginTester.class.getResource("/resource.txt").toURI()).getParentFile();
-            File ymlPath = new File(EmbulkPluginTester.class.getResource(yml).toURI());
-            File tempYmlPath = new File(ymlPath.getParentFile(), "temp-" + ymlPath.getName());
-            Pattern pathPrefixPattern = Pattern.compile("^ *path(_prefix)?: '(.*)'$");
-            try (BufferedReader reader = new BufferedReader(new FileReader(ymlPath))) {
-                try (BufferedWriter writer = new BufferedWriter(new FileWriter(tempYmlPath))) {
-                    String line;
-                    while ((line = reader.readLine()) != null) {
-                        Matcher matcher = pathPrefixPattern.matcher(line);
-                        if (matcher.matches()) {
-                            int group = 2;
-                            writer.write(line.substring(0, matcher.start(group)));
-                            writer.write(new File(rootPath, matcher.group(group)).getAbsolutePath());
-                            writer.write(line.substring(matcher.end(group)));
-                        } else {
-                            writer.write(line);
-                        }
-                        writer.newLine();
-                    }
-                }
-            }
-            return tempYmlPath.getAbsoluteFile();
-
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}

data/src/test/java/org/embulk/output/oracle/EmptyConfigSource.java

@@ -1,105 +0,0 @@
-package org.embulk.output.oracle;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.embulk.config.ConfigSource;
-import org.embulk.config.DataSource;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-public class EmptyConfigSource implements ConfigSource
-{
-
-    @Override
-    public <E> E get(Class<E> type, String attrName)
-    {
-        return null;
-    }
-
-    @Override
-    public <E> E get(Class<E> type, String attrName, E defaultValue)
-    {
-        return defaultValue;
-    }
-
-    @Override
-    public List<String> getAttributeNames()
-    {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public Iterable<Entry<String, JsonNode>> getAttributes()
-    {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public ObjectNode getObjectNode()
-    {
-        return null;
-    }
-
-    @Override
-    public boolean isEmpty()
-    {
-        return true;
-    }
-
-    @Override
-    public ConfigSource deepCopy()
-    {
-        return this;
-    }
-
-    @Override
-    public ConfigSource getNested(String s)
-    {
-        return null;
-    }
-
-    @Override
-    public ConfigSource getNestedOrSetEmpty(String s)
-    {
-        return null;
-    }
-
-    @Override
-    public <T> T loadConfig(Class<T> class1)
-    {
-        return null;
-    }
-
-    @Override
-    public ConfigSource merge(DataSource datasource)
-    {
-        return null;
-    }
-
-    @Override
-    public ConfigSource set(String s, Object obj)
-    {
-        return null;
-    }
-
-    @Override
-    public ConfigSource setAll(DataSource datasource)
-    {
-        return null;
-    }
-
-    @Override
-    public ConfigSource setNested(String s, DataSource datasource)
-    {
-        return null;
-    }
-
-    @Override
-    public ConfigSource remove(String s) {
-        return null;
-    }
-
-}