embulk 0.8.35-java → 0.10.24-java

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

@@ -1,6 +0,0 @@
-package org.embulk.spi.time;
-
-public interface JRubyTimeParserHelperFactory
-{
-    JRubyTimeParserHelper newInstance(String formatString, int year, int mon, int day, int hour, int min, int sec, int usec);
-}

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

@@ -1,159 +0,0 @@
-package org.embulk.spi.time;
-
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.DateTime;
-import org.jruby.Ruby;
-import org.jruby.RubyTime;
-
-public class Timestamp
-        implements Comparable<Timestamp>
-{
-    private final static DateTimeFormatter TO_STRING_FORMATTER_SECONDS = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss ").withZoneUTC();
-    private final static DateTimeFormatter TO_STRING_FORMATTER_MILLIS = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS ").withZoneUTC();
-    private final static DateTimeFormatter TO_STRING_FORMATTER_CUSTOM = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss").withZoneUTC();
-    private static final Pattern FROM_STRING_PATTERN = Pattern.compile("(\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2})(?:\\.(\\d{1,9}))? (?:UTC|\\+?00\\:?00)");
-
-    private final long seconds;
-    private final int nano;
-
-    private Timestamp(long seconds, int nano)
-    {
-        this.seconds = seconds;
-        this.nano = nano;
-    }
-
-    public static Timestamp ofEpochSecond(long epochSecond)
-    {
-        return new Timestamp(epochSecond, 0);
-    }
-
-    public static Timestamp ofEpochSecond(long epochSecond, long nanoAdjustment)
-    {
-        return new Timestamp(epochSecond + nanoAdjustment / 1000000000, (int) (nanoAdjustment % 1000000000));
-    }
-
-    public static Timestamp ofEpochMilli(long epochMilli)
-    {
-        return new Timestamp(epochMilli / 1000, (int) (epochMilli % 1000 * 1000000));
-    }
-
-    public long getEpochSecond()
-    {
-        return seconds;
-    }
-
-    public int getNano()
-    {
-        return nano;
-    }
-
-    public long toEpochMilli()
-    {
-        return seconds * 1000 + nano / 1000000;
-    }
-
-    @Override
-    public boolean equals(Object other)
-    {
-        if (this == other) {
-            return true;
-        }
-        if (!(other instanceof Timestamp)) {
-            return false;
-        }
-        Timestamp o = (Timestamp) other;
-        return this.seconds == o.seconds && this.nano == o.nano;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        int h = (int) (seconds ^ (seconds >>> 32));
-        h += 17 * nano;
-        return h;
-    }
-
-    @Override
-    public int compareTo(Timestamp t)
-    {
-        if (seconds < t.seconds) {
-            return -1;
-        } else if (seconds == t.seconds) {
-            return nano == t.nano ? 0 : (nano < t.nano ? -1 : 1);
-        } else {
-            return 1;
-        }
-    }
-
-    public RubyTime getRubyTime(Ruby runtime)
-    {
-        RubyTime time = new RubyTime(runtime, runtime.getClass("Time"), new DateTime(toEpochMilli())).gmtime();
-        time.setNSec(nano % 1000000);
-        return time;
-    }
-
-    public static Timestamp fromRubyTime(RubyTime time)
-    {
-        long msec = time.getDateTime().getMillis();
-        long sec = msec / 1000;
-        long nsec = time.getNSec() + (msec % 1000) * 1000000;
-        return Timestamp.ofEpochSecond(sec, nsec);
-    }
-
-    @Override
-    public String toString()
-    {
-        if (nano == 0) {
-            return TO_STRING_FORMATTER_SECONDS.print(getEpochSecond() * 1000) + "UTC";
-
-        } else if (nano % 1000000 == 0) {
-            return TO_STRING_FORMATTER_MILLIS.print(toEpochMilli()) + "UTC";
-
-        } else {
-            StringBuffer sb = new StringBuffer();
-            TO_STRING_FORMATTER_CUSTOM.printTo(sb, getEpochSecond() * 1000);
-            sb.append(".");
-
-            String digits;
-            int zeroDigits;
-            if (nano % 1000 == 0) {
-                digits = Integer.toString(nano / 1000);
-                zeroDigits = 6 - digits.length();
-            } else {
-                digits = Integer.toString(nano);
-                zeroDigits = 9 - digits.length();
-            }
-            sb.append(digits);
-            for (; zeroDigits > 0; zeroDigits--) {
-                sb.append('0');
-            }
-
-            sb.append(" UTC");
-            return sb.toString();
-        }
-    }
-
-    static Timestamp fromString(String text)
-    {
-        // TODO exception handling
-        Matcher m = FROM_STRING_PATTERN.matcher(text);
-        if (!m.matches()) {
-            throw new IllegalArgumentException(String.format("Invalid timestamp format '%s'", text));
-        }
-
-        long seconds = TO_STRING_FORMATTER_CUSTOM.parseDateTime(m.group(1)).getMillis() / 1000;
-
-        int nano;
-        String frac = m.group(2);
-        if (frac == null) {
-            nano = 0;
-        } else {
-            nano = Integer.parseInt(frac) * (int) Math.pow(10, 9 - frac.length());
-        }
-
-        return new Timestamp(seconds, nano);
-    }
-}

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

@@ -1,100 +0,0 @@
-package org.embulk.spi.time;
-
-import java.util.Set;
-import com.google.common.collect.ImmutableSet;
-import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import org.joda.time.DateTimeZone;
-import org.joda.time.format.DateTimeFormat;
-
-public class TimestampFormat
-{
-    private final String format;
-
-    @JsonCreator
-    public TimestampFormat(String format)
-    {
-        this.format = format;
-    }
-
-    @JsonValue
-    public String getFormat()
-    {
-        return format;
-    }
-
-    @Deprecated
-    public TimestampFormatter newFormatter(TimestampFormatter.FormatterTask task)
-    {
-        return new TimestampFormatter(format, task.getTimeZone());
-    }
-
-    @Deprecated
-    public TimestampParser newParser(TimestampParser.ParserTask task)
-    {
-        return new TimestampParser(format, task.getDefaultTimeZone());
-    }
-
-    private static Set<String> availableTimeZoneNames = ImmutableSet.copyOf(DateTimeZone.getAvailableIDs());
-
-    public static DateTimeZone parseDateTimeZone(String s)
-    {
-        if(s.startsWith("+") || s.startsWith("-")) {
-            return DateTimeZone.forID(s);
-
-        } else if (s.equals("Z")) {
-            return DateTimeZone.UTC;
-
-        } else {
-            try {
-                int rawOffset = (int) DateTimeFormat.forPattern("z").parseMillis(s);
-                if(rawOffset == 0) {
-                    return DateTimeZone.UTC;
-                }
-                int offset = rawOffset / -1000;
-                int h = offset / 3600;
-                int m = offset % 3600;
-                return DateTimeZone.forOffsetHoursMinutes(h, m);
-            } catch (IllegalArgumentException ex) {
-                // parseMillis failed
-            }
-
-            // TimeZone.getTimeZone returns GMT zone if given timezone id is not found
-            // we want to only return timezone if exact match, otherwise exception
-            if (availableTimeZoneNames.contains(s)) {
-                //return TimeZone.getTimeZone(s);
-                return DateTimeZone.forID(s);
-            }
-            return null;
-        }
-    }
-
-    //// Java standard TimeZone
-    //static TimeZone parseDateTimeZone(String s)
-    //{
-    //    if(s.startsWith("+") || s.startsWith("-")) {
-    //        return TimeZone.getTimeZone("GMT"+s);
-    //
-    //    } else {
-    //        ParsePosition pp = new ParsePosition(0);
-    //        Date off = new SimpleDateFormat("z").parse(s, pp);
-    //        if(off != null && pp.getErrorIndex() == -1) {
-    //            int rawOffset = (int) off.getTime();
-    //            if(rawOffset == 0) {
-    //                return TimeZone.UTC;
-    //            }
-    //            int offset = rawOffset / -1000;
-    //            int h = offset / 3600;
-    //            int m = offset % 3600;
-    //            return DateTimeZone.getTimeZone(String.format("GMT%+02d%02d", h, m));
-    //        }
-    //
-    //        // TimeZone.getTimeZone returns GMT zone if given timezone id is not found
-    //        // we want to only return timezone if exact match, otherwise exception
-    //        if (availableTimeZoneNames.contains(s)) {
-    //            return TimeZone.getTimeZone(s);
-    //        }
-    //        return null;
-    //    }
-    //}
-}

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

@@ -1,125 +0,0 @@
-package org.embulk.spi.time;
-
-import java.util.Locale;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import com.google.common.base.Optional;
-import org.jruby.embed.ScriptingContainer;
-import org.jruby.util.RubyDateFormat;
-import org.embulk.config.Config;
-import org.embulk.config.ConfigInject;
-import org.embulk.config.ConfigDefault;
-import org.embulk.spi.util.LineEncoder;
-
-public class TimestampFormatter
-{
-    @Deprecated
-    public interface FormatterTask
-            extends org.embulk.config.Task
-    {
-        @Config("timezone")
-        @ConfigDefault("\"UTC\"")
-        public DateTimeZone getTimeZone();
-
-        @ConfigInject
-        @Deprecated
-        public ScriptingContainer getJRuby();
-    }
-
-    public interface Task
-    {
-        @Config("default_timezone")
-        @ConfigDefault("\"UTC\"")
-        public DateTimeZone getDefaultTimeZone();
-
-        @Config("default_timestamp_format")
-        @ConfigDefault("\"%Y-%m-%d %H:%M:%S.%6N %z\"")
-        public String getDefaultTimestampFormat();
-
-        @ConfigInject
-        @Deprecated
-        public ScriptingContainer getJRuby();
-    }
-
-    public interface TimestampColumnOption
-    {
-        @Config("timezone")
-        @ConfigDefault("null")
-        public Optional<DateTimeZone> getTimeZone();
-
-        @Config("format")
-        @ConfigDefault("null")
-        public Optional<String> getFormat();
-    }
-
-    private final RubyDateFormat dateFormat;
-    private final DateTimeZone timeZone;
-
-    @Deprecated
-    public TimestampFormatter(String format, FormatterTask task)
-    {
-        this(format, task.getTimeZone());
-        // NOTE: Its deprecation is not actually from ScriptingContainer, though.
-        // TODO: Notify users about deprecated calls through the notification reporter.
-        if (!deprecationWarned) {
-            System.err.println("[WARN] Plugin uses deprecated constructor of org.embulk.spi.time.TimestampFormatter.");
-            System.err.println("[WARN] Report plugins in your config at: https://github.com/embulk/embulk/issues/745");
-            // The |deprecationWarned| flag is used only for warning messages.
-            // Even in case of race conditions, messages are just duplicated -- should be acceptable.
-            deprecationWarned = true;
-        }
-    }
-
-    public TimestampFormatter(Task task, Optional<? extends TimestampColumnOption> columnOption)
-    {
-        this(
-                columnOption.isPresent() ?
-                    columnOption.get().getFormat().or(task.getDefaultTimestampFormat())
-                    : task.getDefaultTimestampFormat(),
-                columnOption.isPresent() ?
-                    columnOption.get().getTimeZone().or(task.getDefaultTimeZone())
-                    : task.getDefaultTimeZone());
-    }
-
-    @Deprecated
-    public TimestampFormatter(ScriptingContainer jruby, String format, DateTimeZone timeZone)
-    {
-        this(format, timeZone);
-        // TODO: Notify users about deprecated calls through the notification reporter.
-        if (!deprecationWarned) {
-            System.err.println("[WARN] Plugin uses deprecated constructor of org.embulk.spi.time.TimestampFormatter.");
-            System.err.println("[WARN] Report plugins in your config at: https://github.com/embulk/embulk/issues/745");
-            // The |deprecationWarned| flag is used only for warning messages.
-            // Even in case of race conditions, messages are just duplicated -- should be acceptable.
-            deprecationWarned = true;
-        }
-    }
-
-    public TimestampFormatter(final String format, final DateTimeZone timeZone)
-    {
-        this.timeZone = timeZone;
-        this.dateFormat = new RubyDateFormat(format, Locale.ENGLISH, true);
-    }
-
-    public DateTimeZone getTimeZone()
-    {
-        return timeZone;
-    }
-
-    public void format(Timestamp value, LineEncoder encoder)
-    {
-        // TODO optimize by directly appending to internal buffer
-        encoder.addText(format(value));
-    }
-
-    public String format(Timestamp value)
-    {
-        // TODO optimize by using reused StringBuilder
-        dateFormat.setDateTime(new DateTime(value.getEpochSecond()*1000, timeZone));
-        dateFormat.setNSec(value.getNano());
-        return dateFormat.format(null);
-    }
-
-    // TODO: Remove this once deprecated constructors are finally removed.
-    private static boolean deprecationWarned = false;
-}

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

@@ -1,12 +0,0 @@
-package org.embulk.spi.time;
-
-import org.embulk.spi.DataException;
-
-public class TimestampParseException
-        extends DataException
-{
-    public TimestampParseException(String message)
-    {
-        super(message);
-    }
-}

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

@@ -1,283 +0,0 @@
-package org.embulk.spi.time;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.TimeZone;
-import org.embulk.config.Config;
-import org.embulk.config.ConfigDefault;
-import org.embulk.config.ConfigException;
-import org.embulk.config.ConfigInject;
-import org.embulk.spi.time.StrptimeParser.FormatBag;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.jruby.embed.ScriptingContainer;
-
-import static com.google.common.base.Strings.isNullOrEmpty;
-import static org.embulk.spi.time.TimestampFormat.parseDateTimeZone;
-
-public class TimestampParser
-{
-    @Deprecated
-    public interface ParserTask
-            extends org.embulk.config.Task
-    {
-        @Config("default_timezone")
-        @ConfigDefault("\"UTC\"")
-        public DateTimeZone getDefaultTimeZone();
-
-        @ConfigInject
-        @Deprecated
-        public ScriptingContainer getJRuby();
-    }
-
-    public interface Task
-    {
-        @Config("default_timezone")
-        @ConfigDefault("\"UTC\"")
-        public DateTimeZone getDefaultTimeZone();
-
-        @Config("default_timestamp_format")
-        @ConfigDefault("\"%Y-%m-%d %H:%M:%S.%N %z\"")
-        public String getDefaultTimestampFormat();
-
-        @Config("default_date")
-        @ConfigDefault("\"1970-01-01\"")
-        public String getDefaultDate();
-
-        @ConfigInject
-        @Deprecated
-        public ScriptingContainer getJRuby();
-    }
-
-    public interface TimestampColumnOption
-    {
-        @Config("timezone")
-        @ConfigDefault("null")
-        public Optional<DateTimeZone> getTimeZone();
-
-        @Config("format")
-        @ConfigDefault("null")
-        public Optional<String> getFormat();
-
-        @Config("date")
-        @ConfigDefault("null")
-        public Optional<String> getDate();
-    }
-
-    private final DateTimeZone defaultTimeZone;
-    private final String format;
-    private final StrptimeParser parser;
-    private final Calendar calendar;
-    private final List<StrptimeToken> compiledPattern;
-
-    @Deprecated
-    public TimestampParser(String format, ParserTask task)
-    {
-        this(format, task.getDefaultTimeZone());
-        // NOTE: Its deprecation is not actually from ScriptingContainer, though.
-        // TODO: Notify users about deprecated calls through the notification reporter.
-        if (!deprecationWarned) {
-            System.err.println("[WARN] Plugin uses deprecated constructor of org.embulk.spi.time.TimestampParser.");
-            System.err.println("[WARN] Report plugins in your config at: https://github.com/embulk/embulk/issues/745");
-            // The |deprecationWarned| flag is used only for warning messages.
-            // Even in case of race conditions, messages are just duplicated -- should be acceptable.
-            deprecationWarned = true;
-        }
-    }
-
-    @VisibleForTesting
-    static TimestampParser createTimestampParserForTesting(Task task)
-
-    {
-        return new TimestampParser(task.getDefaultTimestampFormat(), task.getDefaultTimeZone(), task.getDefaultDate());
-    }
-
-    public TimestampParser(Task task, TimestampColumnOption columnOption)
-    {
-        this(
-                columnOption.getFormat().or(task.getDefaultTimestampFormat()),
-                columnOption.getTimeZone().or(task.getDefaultTimeZone()),
-                columnOption.getDate().or(task.getDefaultDate()));
-    }
-
-    @Deprecated
-    public TimestampParser(ScriptingContainer jruby, String format, DateTimeZone defaultTimeZone)
-    {
-        this(format, defaultTimeZone);
-        // TODO: Notify users about deprecated calls through the notification reporter.
-        if (!deprecationWarned) {
-            System.err.println("[WARN] Plugin uses deprecated constructor of org.embulk.spi.time.TimestampParser.");
-            System.err.println("[WARN] Report plugins in your config at: https://github.com/embulk/embulk/issues/745");
-            // The |deprecationWarned| flag is used only for warning messages.
-            // Even in case of race conditions, messages are just duplicated -- should be acceptable.
-            deprecationWarned = true;
-        }
-    }
-
-    public TimestampParser(String format, DateTimeZone defaultTimeZone)
-    {
-        this(format, defaultTimeZone, "1970-01-01");
-    }
-
-    @Deprecated
-    public TimestampParser(ScriptingContainer jruby, String format, DateTimeZone defaultTimeZone, String defaultDate)
-    {
-        this(format, defaultTimeZone, defaultDate);
-        // TODO: Notify users about deprecated calls through the notification reporter.
-        if (!deprecationWarned) {
-            System.err.println("[WARN] Plugin uses deprecated constructor of org.embulk.spi.time.TimestampParser.");
-            System.err.println("[WARN] Report plugins in your config at: https://github.com/embulk/embulk/issues/745");
-            // The |deprecationWarned| flag is used only for warning messages.
-            // Even in case of race conditions, messages are just duplicated -- should be acceptable.
-            deprecationWarned = true;
-        }
-    }
-
-    public TimestampParser(final String format, final DateTimeZone defaultTimeZone, final String defaultDate)
-    {
-        // TODO get default current time from ExecTask.getExecTimestamp
-        this.format = format;
-        this.parser = new StrptimeParser();
-        this.compiledPattern = this.parser.compilePattern(format);
-        this.defaultTimeZone = defaultTimeZone;
-
-        // calculate default date
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH);
-        df.setTimeZone(TimeZone.getTimeZone("UTC"));
-        Date utc;
-        try {
-            utc = df.parse(defaultDate);
-        }
-        catch (ParseException ex) {
-            throw new ConfigException("Invalid date format. Expected yyyy-MM-dd: " + defaultDate);
-        }
-        this.calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.ENGLISH);
-        this.calendar.setTime(utc);
-    }
-
-    public DateTimeZone getDefaultTimeZone()
-    {
-        return defaultTimeZone;
-    }
-
-    public Timestamp parse(String text) throws TimestampParseException
-    {
-        if (isNullOrEmpty(text)) {
-            throw new TimestampParseException("text is null or empty string.");
-        }
-
-        final FormatBag bag = parser.parse(compiledPattern, text);
-        if (bag == null) {
-            throw new TimestampParseException("Cannot parse '" + text + "' by '" + format + "'");
-        }
-        bag.setYearIfNotSet(calendar.get(Calendar.YEAR));
-        bag.setMonthIfNotSet(calendar.get(Calendar.MONTH) + 1);
-        bag.setMdayIfNotSet(calendar.get(Calendar.DAY_OF_MONTH));
-
-        final LocalTime local = createLocalTimeFromFormatBag(bag);
-        final String zone = local.getZone();
-        final DateTimeZone timeZone;
-        if (zone != null) {
-            // TODO cache parsed zone?
-            timeZone = parseDateTimeZone(zone);
-            if (timeZone == null) {
-                throw new TimestampParseException("Invalid time zone name '" + text + "'");
-            }
-        }
-        else {
-            timeZone = defaultTimeZone;
-        }
-
-        final long sec = timeZone.convertLocalToUTC(local.getSeconds() * 1000, false) / 1000;
-        return Timestamp.ofEpochSecond(sec, local.getNsecFraction());
-    }
-
-    public LocalTime createLocalTimeFromFormatBag(FormatBag bag)
-    {
-        final long secFractionNsec;
-        if (FormatBag.has(bag.getSecFraction())) {
-            secFractionNsec = bag.getSecFraction() * (int)Math.pow(10, 9 - bag.getSecFractionSize());
-        }
-        else {
-            secFractionNsec = 0;
-        }
-
-        final long sec;
-        if (bag.hasSeconds()) {
-            if (FormatBag.has(bag.getSecondsSize())) {
-                sec = bag.getSeconds() / (int)Math.pow(10, bag.getSecondsSize());
-            }
-            else { // int
-                sec = bag.getSeconds();
-            }
-
-        } else {
-            final int year;
-            if (FormatBag.has(bag.getYear())) {
-                year = bag.getYear();
-            }
-            else {
-                year = 1970;
-            }
-
-            // set up with min this and then add to allow rolling over
-            DateTime dt = new DateTime(year, 1, 1, 0, 0, 0, 0, DateTimeZone.UTC);
-            if (FormatBag.has(bag.getMon())) {
-                dt = dt.plusMonths(bag.getMon() - 1);
-            }
-            if (FormatBag.has(bag.getMDay())) {
-                dt = dt.plusDays(bag.getMDay() - 1);
-            }
-            if (FormatBag.has(bag.getHour())) {
-                dt = dt.plusHours(bag.getHour());
-            }
-            if (FormatBag.has(bag.getMin())) {
-                dt = dt.plusMinutes(bag.getMin());
-            }
-            if (FormatBag.has(bag.getSec())) {
-                dt = dt.plusSeconds(bag.getSec());
-            }
-            sec = dt.getMillis() / 1000;
-        }
-
-        return new LocalTime(sec, secFractionNsec, bag.getZone());
-    }
-
-    private static class LocalTime
-    {
-        private final long seconds;
-        private final long nsecFraction;
-        private final String zone;  // +0900, JST, UTC
-
-        public LocalTime(long seconds, long nsecFraction, String zone)
-        {
-            this.seconds = seconds;
-            this.nsecFraction = nsecFraction;
-            this.zone = zone;
-        }
-
-        public long getSeconds()
-        {
-            return seconds;
-        }
-
-        public long getNsecFraction()
-        {
-            return nsecFraction;
-        }
-
-        public String getZone()
-        {
-            return zone;
-        }
-    }
-
-    // TODO: Remove this once deprecated constructors are finally removed.
-    private static boolean deprecationWarned = false;
-}