embulk 0.8.39-java → 0.10.24-java

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,310 +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 '" + zone + "' in '" + 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.getSecondsSize())) {  // %Q is specified.
-            // Fractions by %Q are prioritized over fractions by %N.
-            // irb(main):002:0> Time.strptime("123456789 12.345", "%Q %S.%N").nsec
-            // => 789000000
-            // irb(main):003:0> Time.strptime("12.345 123456789", "%S.%N %Q").nsec
-            // => 789000000
-            // irb(main):004:0> Time.strptime("12.345", "%S.%N").nsec
-            // => 345000000
-            if (bag.hasSeconds()) {
-                secFractionNsec = (bag.getSeconds() % (int)Math.pow(10, bag.getSecondsSize())) *
-                                  (int)Math.pow(10, 9 - bag.getSecondsSize());
-            }
-            else {
-                // It must not happen -- |seconds| is always set if |secondsSize| is set.
-                secFractionNsec = 0;
-            }
-        }
-        else 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.getYDay())) {  // yday is more prioritized than mon/mday in Ruby's strptime.
-                dt = dt.plusDays(bag.getYDay() - 1);
-            }
-            else {
-                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())) {
-                if (bag.getSec() == 60) {  // Leap seconds are considered as 59 when Ruby converts them to epochs.
-                    dt = dt.plusSeconds(59);
-                }
-                else {
-                    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;
-}

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

@@ -1,49 +0,0 @@
-package org.embulk.spi.time;
-
-import java.io.IOException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.deser.std.FromStringDeserializer;
-import com.fasterxml.jackson.module.guice.ObjectMapperModule;
-
-public class TimestampSerDe
-{
-    public static void configure(ObjectMapperModule mapper)
-    {
-        SimpleModule module = new SimpleModule();
-        module.addSerializer(Timestamp.class, new DateTimeZoneSerializer());
-        module.addDeserializer(Timestamp.class, new DateTimeZoneDeserializer());
-        mapper.registerModule(module);
-    }
-
-    public static class DateTimeZoneSerializer
-            extends JsonSerializer<Timestamp>
-    {
-        @Override
-        public void serialize(Timestamp value, JsonGenerator jgen, SerializerProvider provider)
-                throws IOException
-        {
-            jgen.writeString(value.toString());
-        }
-    }
-
-    public static class DateTimeZoneDeserializer
-            extends FromStringDeserializer<Timestamp>
-    {
-        public DateTimeZoneDeserializer()
-        {
-            super(Timestamp.class);
-        }
-
-        @Override
-        protected Timestamp _deserialize(String value, DeserializationContext context)
-                throws JsonMappingException
-        {
-            return Timestamp.fromString(value);
-        }
-    }
-}

data/embulk-core/src/main/java/org/embulk/spi/type/AbstractType.java

@@ -1,58 +0,0 @@
-package org.embulk.spi.type;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-public abstract class AbstractType
-        implements Type
-{
-    private final String name;
-    private final Class<?> javaType;
-    private byte fixedStorageSize;
-
-    protected AbstractType(String name, Class<?> javaType, int fixedStorageSize)
-    {
-        this.name = name;
-        this.javaType = javaType;
-        this.fixedStorageSize = (byte) fixedStorageSize;
-    }
-
-    @Override
-    public String getName()
-    {
-        return name;
-    }
-
-    @Override
-    public Class<?> getJavaType()
-    {
-        return javaType;
-    }
-
-    @Override
-    public byte getFixedStorageSize()
-    {
-        return fixedStorageSize;
-    }
-
-    @SuppressFBWarnings(value = "EQ_UNUSUAL")
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == null) {
-            return false;
-        }
-        return o.getClass().isAssignableFrom(getClass());
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return getClass().hashCode();
-    }
-
-    @Override
-    public String toString()
-    {
-        return name;
-    }
-}

data/embulk-core/src/main/java/org/embulk/spi/type/BooleanType.java

@@ -1,12 +0,0 @@
-package org.embulk.spi.type;
-
-public class BooleanType
-        extends AbstractType
-{
-    static final BooleanType BOOLEAN = new BooleanType();
-
-    private BooleanType()
-    {
-        super("boolean", boolean.class, 1);
-    }
-}

data/embulk-core/src/main/java/org/embulk/spi/type/DoubleType.java

@@ -1,12 +0,0 @@
-package org.embulk.spi.type;
-
-public class DoubleType
-        extends AbstractType
-{
-    static final DoubleType DOUBLE = new DoubleType();
-
-    private DoubleType()
-    {
-        super("double", double.class, 8);
-    }
-}