embulk 0.8.39-java → 0.10.24-java

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

@@ -1,180 +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;
-        }
-    }
-
-    @Deprecated
-    public RubyTime getRubyTime(Ruby runtime)
-    {
-        if (!getRubyTimeDeprecationWarned) {
-            System.err.println("[WARN] Plugin uses deprecated org.embulk.spi.time.Timestamp.getRubyTime");
-            System.err.println("[WARN] Report plugins in your config at: https://github.com/embulk/embulk/issues/820");
-            // The |getRubyTimeDeprecationWarned| flag is used only for warning messages.
-            // Even in case of race conditions, messages are just duplicated -- should be acceptable.
-            getRubyTimeDeprecationWarned = true;
-        }
-
-        RubyTime time = new RubyTime(runtime, runtime.getClass("Time"), new DateTime(toEpochMilli())).gmtime();
-        time.setNSec(nano % 1000000);
-        return time;
-    }
-
-    @Deprecated
-    public static Timestamp fromRubyTime(RubyTime time)
-    {
-        if (!fromRubyTimeDeprecationWarned) {
-            System.err.println("[WARN] Plugin uses deprecated org.embulk.spi.time.Timestamp.fromRubyTime");
-            System.err.println("[WARN] Report plugins in your config at: https://github.com/embulk/embulk/issues/820");
-            // The |fromRubyTimeDeprecationWarned| flag is used only for warning messages.
-            // Even in case of race conditions, messages are just duplicated -- should be acceptable.
-            fromRubyTimeDeprecationWarned = true;
-        }
-
-        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);
-    }
-
-    private static boolean getRubyTimeDeprecationWarned = false;
-    private static boolean fromRubyTimeDeprecationWarned = false;
-}

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

@@ -1,158 +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)
-    {
-        // NOTE: Its deprecation is not actually from ScriptingContainer, though.
-        // TODO: Notify users about deprecated calls through the notification reporter.
-        if (!newFormatterDeprecationWarned) {
-            System.err.println("[WARN] Plugin uses deprecated method org.embulk.spi.time.TimestampFormat.newFormatter");
-            System.err.println("[WARN] Report plugins in your config at: https://github.com/embulk/embulk/issues/828");
-            // The |newFormatterDeprecationWarned| flag is used only for warning messages.
-            // Even in case of race conditions, messages are just duplicated -- should be acceptable.
-            newFormatterDeprecationWarned = true;
-        }
-        return new TimestampFormatter(format, task.getTimeZone());
-    }
-
-    @Deprecated
-    public TimestampParser newParser(TimestampParser.ParserTask task)
-    {
-        // NOTE: Its deprecation is not actually from ScriptingContainer, though.
-        // TODO: Notify users about deprecated calls through the notification reporter.
-        if (!newParserDeprecationWarned) {
-            System.err.println("[WARN] Plugin uses deprecated method org.embulk.spi.time.TimestampFormat.newParser");
-            System.err.println("[WARN] Report plugins in your config at: https://github.com/embulk/embulk/issues/828");
-            // The |newParserDeprecationWarned| flag is used only for warning messages.
-            // Even in case of race conditions, messages are just duplicated -- should be acceptable.
-            newParserDeprecationWarned = true;
-        }
-        return new TimestampParser(format, task.getDefaultTimeZone());
-    }
-
-    private static Set<String> availableTimeZoneNames = ImmutableSet.copyOf(DateTimeZone.getAvailableIDs());
-
-    public static DateTimeZone parseDateTimeZone(String s)
-    {
-        DateTimeZone jodaDateTimeZoneTemporary = null;
-        try {
-            // Use TimeZone#forID, not TimeZone#getTimeZone.
-            // Because getTimeZone returns GMT even if given timezone id is not found.
-            jodaDateTimeZoneTemporary = DateTimeZone.forID(s);
-        }
-        catch (IllegalArgumentException ex) {
-            jodaDateTimeZoneTemporary = null;
-        }
-        final DateTimeZone jodaDateTimeZone = jodaDateTimeZoneTemporary;
-
-        if (jodaDateTimeZone != null && (s.startsWith("+") || s.startsWith("-"))) {
-            return jodaDateTimeZone;
-
-        } else if (s.equals("Z")) {
-            return DateTimeZone.UTC;
-
-        } else {
-            try {
-                // DateTimeFormat.forPattern("z").parseMillis(s) is incorrect, but kept for compatibility as of now.
-                //
-                // The offset of PDT (Pacific Daylight Time) should be -07:00.
-                // DateTimeFormat.forPattern("z").parseMillis("PDT") however returns 8 hours (-08:00).
-                // DateTimeFormat.forPattern("z").parseMillis("PDT") == 28800000
-                // https://github.com/JodaOrg/joda-time/blob/v2.9.2/src/main/java/org/joda/time/DateTimeUtils.java#L446
-                //
-                // Embulk has used it to parse time zones for a very long time since it was v0.1.
-                // https://github.com/embulk/embulk/commit/b97954a5c78397e1269bbb6979d6225dfceb4e05
-                //
-                // It is kept as -08:00 for compatibility as of now.
-                //
-                // TODO: Make time zone parsing consistent.
-                // @see <a href="https://github.com/embulk/embulk/issues/860">https://github.com/embulk/embulk/issues/860</a>
-                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
-            }
-
-            if (jodaDateTimeZone != null && availableTimeZoneNames.contains(s)) {
-                return jodaDateTimeZone;
-            }
-
-            // Parsing Ruby-style time zones in lower priority than Joda-Time because
-            // TimestampParser has parsed time zones with Joda-Time for a long time
-            // since ancient. The behavior is kept for compatibility.
-            //
-            // The following time zone IDs are duplicated in Ruby and Joda-Time 2.9.2
-            // while Ruby does not care summer time and Joda-Time cares summer time.
-            // "CET", "EET", "Egypt", "Iran", "MET", "WET"
-            //
-            // Some zone IDs (ex. "PDT") are parsed by DateTimeFormat#parseMillis as shown above.
-            final int rubyStyleTimeOffsetInSecond = TimeZoneConverter.dateZoneToDiff(s);
-            if (rubyStyleTimeOffsetInSecond != Integer.MIN_VALUE) {
-                return DateTimeZone.forOffsetMillis(rubyStyleTimeOffsetInSecond * 1000);
-            }
-
-            return null;
-        }
-    }
-
-    private static boolean newFormatterDeprecationWarned = false;
-    private static boolean newParserDeprecationWarned = false;
-
-    //// 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;
-}