embulk 0.8.35-java → 0.10.24-java

data/embulk-cli/src/main/java/org/embulk/cli/parse/CliOptionsWithHelpMessages.java

@@ -1,45 +0,0 @@
-package org.embulk.cli.parse;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-
-/**
- * CliOptionsWithHelpMessages is an extension of commons-cli's org.apache.commons.cli.Options.
- *
- * It just recognizes {@code HelpMessageAsCliOption} while others are same with {@code org.apache.commons.cli.Options}.
- * {@code HelpMessageAsCliOption} is added just as a help message line, but ignored as a command line option.
- *
- * It is visible only in |org.embulk.cli.parse| because it is an extension of a commons-cli class.
- * Dependencies on third-party libraries are to be encapsulated.
- */
-final class CliOptionsWithHelpMessages
-        extends Options
-{
-    CliOptionsWithHelpMessages()
-    {
-        this.allOptions = new ArrayList<Option>();
-    }
-
-    /**
-     * Adds commons-cli's {@code org.apache.commons.cli.Option}.
-     */
-    @Override
-    public final Options addOption(final Option option)
-    {
-        this.allOptions.add(option);
-        if (option instanceof HelpMessageAsCliOption) {
-            return this;
-        }
-        return super.addOption(option);
-    }
-
-    final List<Option> getAllOptions()
-    {
-        return Collections.unmodifiableList(this.allOptions);
-    }
-
-    private final ArrayList<Option> allOptions;
-}

data/embulk-cli/src/main/java/org/embulk/cli/parse/EmbulkCommandLineHelpRequired.java

@@ -1,10 +0,0 @@
-package org.embulk.cli.parse;
-
-public final class EmbulkCommandLineHelpRequired
-        extends Throwable
-{
-    EmbulkCommandLineHelpRequired()
-    {
-        super();
-    }
-}

data/embulk-cli/src/main/java/org/embulk/cli/parse/EmbulkCommandLineParseException.java

@@ -1,25 +0,0 @@
-package org.embulk.cli.parse;
-
-public final class EmbulkCommandLineParseException
-        extends Exception
-{
-    protected EmbulkCommandLineParseException()
-    {
-        super();
-    }
-
-    public EmbulkCommandLineParseException(final String message)
-    {
-        super(message);
-    }
-
-    public EmbulkCommandLineParseException(final Throwable cause)
-    {
-        super(cause);
-    }
-
-    public EmbulkCommandLineParseException(final String message, final Throwable cause)
-    {
-        super(message, cause);
-    }
-}

data/embulk-cli/src/main/java/org/embulk/cli/parse/EmbulkCommandLineParser.java

@@ -1,187 +0,0 @@
-package org.embulk.cli.parse;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.ParseException;
-import org.embulk.cli.EmbulkCommandLine;
-
-public class EmbulkCommandLineParser
-{
-    private EmbulkCommandLineParser(
-            final String usage,
-            final List<AbstractHelpLineDefinition> helpLineDefinitions,
-            final int minArgs,
-            final int maxArgs,
-            final int width)
-    {
-        this.usage = usage;
-        this.helpLineDefinitions = Collections.unmodifiableList(helpLineDefinitions);
-        this.minArgs = minArgs;
-        this.maxArgs = maxArgs;
-        this.width = width;
-
-        this.cliOptions = new CliOptionsWithHelpMessages();
-
-        final HashMap<Option, OptionDefinition> optionDefinitionFromCliOption = new HashMap<Option, OptionDefinition>();
-        for (final AbstractHelpLineDefinition definition : this.helpLineDefinitions) {
-            cliOptions.addOption(definition.getCliOption());
-            if (definition instanceof OptionDefinition) {
-                optionDefinitionFromCliOption.put(definition.getCliOption(), ((OptionDefinition) definition));
-            }
-        }
-        this.optionDefinitionFromCliOption = optionDefinitionFromCliOption;
-    }
-
-    public static class Builder
-    {
-        private Builder()
-        {
-            this.mainUsage = null;
-            this.additionalUsage = new StringBuilder();
-            this.helpLineDefinitions = new ArrayList<AbstractHelpLineDefinition>();
-            this.minArgs = 0;
-            this.maxArgs = Integer.MAX_VALUE;
-            this.width = 74;
-        }
-
-        public EmbulkCommandLineParser build()
-        {
-            return new EmbulkCommandLineParser(
-                this.mainUsage + this.additionalUsage.toString(),
-                this.helpLineDefinitions,
-                this.minArgs,
-                this.maxArgs,
-                this.width);
-        }
-
-        public Builder setMainUsage(final String mainUsage)
-        {
-            this.mainUsage = mainUsage;
-            return this;
-        }
-
-        public Builder addUsage(final String line)
-        {
-            this.additionalUsage.append(System.getProperty("line.separator"));
-            this.additionalUsage.append(line);
-            return this;
-        }
-
-        public Builder addOptionDefinition(final OptionDefinition optionDefinition)
-        {
-            this.helpLineDefinitions.add(optionDefinition);
-            return this;
-        }
-
-        public Builder addHelpMessageLine(final String message)
-        {
-            this.helpLineDefinitions.add(new HelpMessageLineDefinition(message));
-            return this;
-        }
-
-        public Builder setArgumentsRange(final int minArgs, final int maxArgs)
-        {
-            this.minArgs = minArgs;
-            this.maxArgs = maxArgs;
-            return this;
-        }
-
-        public Builder setWidth(final int width)
-        {
-            this.width = width;
-            return this;
-        }
-
-        private String mainUsage;
-        private final StringBuilder additionalUsage;
-        private final ArrayList<AbstractHelpLineDefinition> helpLineDefinitions;
-        private int minArgs;
-        private int maxArgs;
-        private int width;
-    }
-
-    public static Builder builder()
-    {
-        return new Builder();
-    }
-
-    public EmbulkCommandLine parse(final List<String> argsEmbulk,
-                                   final List<String> jrubyOptions,
-                                   final PrintWriter helpPrintWriter,
-                                   final PrintWriter errorPrintWriter)
-            throws EmbulkCommandLineParseException, EmbulkCommandLineHelpRequired
-    {
-        final CommandLine cliCommandLine;
-        try {
-            cliCommandLine = new DefaultParser().parse(
-                this.cliOptions, argsEmbulk.toArray(new String[argsEmbulk.size()]));
-        }
-        catch (ParseException ex) {
-            throw new EmbulkCommandLineParseException(ex.getMessage(), ex);
-        }
-
-        for (final Option cliOptionSpecified : cliCommandLine.getOptions()) {
-            final OptionDefinition optionDefinitionSpecified =
-                this.optionDefinitionFromCliOption.get(cliOptionSpecified);
-
-            if (optionDefinitionSpecified.printsHelp()) {
-                throw new EmbulkCommandLineHelpRequired();
-            }
-        }
-
-        final List<String> arguments = cliCommandLine.getArgList();
-        if (arguments.size() < this.minArgs) {
-            throw new EmbulkCommandLineParseException("Too few arguments.");
-        }
-        if (arguments.size() > this.maxArgs) {
-            throw new EmbulkCommandLineParseException("Too many arguments;");
-        }
-
-        final EmbulkCommandLine.Builder commandLineBuilder = EmbulkCommandLine.builder();
-        for (final String jrubyOption : jrubyOptions) {
-            commandLineBuilder.addSystemConfig("jruby_command_line_options", jrubyOption);
-        }
-        commandLineBuilder.addArguments(arguments);
-        for (final Option cliOptionSpecified : cliCommandLine.getOptions()) {
-            final OptionDefinition optionDefinitionSpecified =
-                this.optionDefinitionFromCliOption.get(cliOptionSpecified);
-            optionDefinitionSpecified.behave(commandLineBuilder, cliOptionSpecified.getValue());
-        }
-
-        return commandLineBuilder.build();
-    }
-
-    public final void printHelp(final PrintStream printStream)
-    {
-        this.printHelp(new PrintWriter(printStream));
-    }
-
-    public void printHelp(final PrintWriter printWriter)
-    {
-        final CliHelpFormatterWithHelpMessages helpFormatter = new CliHelpFormatterWithHelpMessages("Usage: ", 32);
-        helpFormatter.printHelp(printWriter,  // PrintWriter pw
-                                this.width,  // int width
-                                this.usage,  // String cmdLineSyntax
-                                "",  // String header
-                                this.cliOptions,  // Options options
-                                4,  // int leftPad
-                                5,  // int descPad
-                                ""  // String footer
-                                );
-    }
-
-    private final String usage;
-    private final List<AbstractHelpLineDefinition> helpLineDefinitions;
-    private final int minArgs;
-    private final int maxArgs;
-    private final int width;
-    private final CliOptionsWithHelpMessages cliOptions;
-    private final HashMap<Option, OptionDefinition> optionDefinitionFromCliOption;
-}

data/embulk-cli/src/main/java/org/embulk/cli/parse/HelpMessageAsCliOption.java

@@ -1,36 +0,0 @@
-package org.embulk.cli.parse;
-
-import org.apache.commons.cli.Option;
-
-final class HelpMessageAsCliOption
-        extends Option
-{
-    public HelpMessageAsCliOption(final String message)
-    {
-        super("_", message);
-    }
-
-    @Override
-    public final String toString()
-    {
-        return this.getDescription();
-    }
-
-    @Override
-    public final boolean equals(Object other)
-    {
-        return this == other;
-    }
-
-    @Override
-    public final int hashCode()
-    {
-        return this.getDescription().hashCode();
-    }
-
-    @Override
-    public final Object clone()
-    {
-        return new HelpMessageAsCliOption(this.getDescription());
-    }
-}

data/embulk-cli/src/main/java/org/embulk/cli/parse/HelpMessageLineDefinition.java

@@ -1,20 +0,0 @@
-package org.embulk.cli.parse;
-
-import org.apache.commons.cli.Option;
-
-class HelpMessageLineDefinition
-        extends AbstractHelpLineDefinition
-{
-    HelpMessageLineDefinition(final String message)
-    {
-        this.cliOption = new HelpMessageAsCliOption(message);
-    }
-
-    @Override
-    final Option getCliOption()
-    {
-        return this.cliOption;
-    }
-
-    private final Option cliOption;
-}

data/embulk-cli/src/main/java/org/embulk/cli/parse/OptionBehavior.java

@@ -1,39 +0,0 @@
-package org.embulk.cli.parse;
-
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import org.embulk.cli.EmbulkCommandLine;
-
-public abstract class OptionBehavior
-{
-    public OptionBehavior()
-    {
-        this.helpWriter = SYSTEM_HELP_WRITER;
-        this.errorWriter = SYSTEM_ERROR_WRITER;
-    }
-
-    public OptionBehavior(final OutputStream helpStream, final OutputStream errorStream)
-    {
-        this.helpWriter = new PrintWriter(helpStream, true);
-        this.errorWriter = new PrintWriter(errorStream, true);
-    }
-
-    public abstract void behave(final EmbulkCommandLine.Builder commandLineBuilder, final String argument)
-            throws EmbulkCommandLineParseException;
-
-    protected final PrintWriter helpWriter()
-    {
-        return this.helpWriter;
-    }
-
-    protected final PrintWriter errorWriter()
-    {
-        return this.errorWriter;
-    }
-
-    private static final PrintWriter SYSTEM_HELP_WRITER = new PrintWriter(System.out, true);
-    private static final PrintWriter SYSTEM_ERROR_WRITER = new PrintWriter(System.err, true);
-
-    private final PrintWriter helpWriter;
-    private final PrintWriter errorWriter;
-}

data/embulk-cli/src/main/java/org/embulk/cli/parse/OptionDefinition.java

@@ -1,120 +0,0 @@
-package org.embulk.cli.parse;
-
-import org.apache.commons.cli.Option;
-import org.embulk.cli.EmbulkCommandLine;
-
-public class OptionDefinition
-        extends AbstractHelpLineDefinition
-{
-    private OptionDefinition(
-            final String shortOption,
-            final String longOption,
-            final boolean hasArgument,
-            final String argumentNameDisplayed,
-            final String description,
-            final boolean printsHelp,
-            final OptionBehavior behavior)
-    {
-        final Option.Builder builder;
-
-        if (shortOption == null) {
-            builder = Option.builder();
-        }
-        else {
-            builder = Option.builder(shortOption);
-        }
-
-        if (longOption != null) {
-            builder.longOpt(longOption);
-        }
-
-        if (hasArgument) {
-            builder.hasArg(true);
-            builder.argName(argumentNameDisplayed);
-        }
-        if (description != null) {
-            builder.desc(description);
-        }
-        this.cliOption = builder.build();
-        this.printsHelp = printsHelp;
-        this.behavior = behavior;
-    }
-
-    public static OptionDefinition defineOnlyLongOptionWithArgument(
-            final String longOption,
-            final String argumentNameDisplayed,
-            final String description,
-            final OptionBehavior behavior)
-    {
-        return new OptionDefinition(null, longOption, true, argumentNameDisplayed, description, false, behavior);
-    }
-
-    public static OptionDefinition defineOnlyShortOptionWithArgument(
-            final String shortOption,
-            final String argumentNameDisplayed,
-            final String description,
-            final OptionBehavior behavior)
-    {
-        return new OptionDefinition(shortOption, null, true, argumentNameDisplayed, description, false, behavior);
-    }
-
-    public static OptionDefinition defineOnlyShortOptionWithoutArgument(
-            final String shortOption,
-            final String description,
-            final OptionBehavior behavior)
-    {
-        return new OptionDefinition(shortOption, null, false, null, description, false, behavior);
-    }
-
-    public static OptionDefinition defineOptionWithoutArgument(
-            final String shortOption,
-            final String longOption,
-            final String description,
-            final OptionBehavior behavior)
-    {
-        return new OptionDefinition(shortOption, longOption, false, null, description, false, behavior);
-    }
-
-    public static OptionDefinition defineOptionWithArgument(
-            final String shortOption,
-            final String longOption,
-            final String argumentNameDisplayed,
-            final String description,
-            final OptionBehavior behavior)
-    {
-        return new OptionDefinition(shortOption, longOption, true, argumentNameDisplayed, description, false, behavior);
-    }
-
-    public static OptionDefinition defineHelpOption(
-            final String shortOption,
-            final String longOption,
-            final String description)
-    {
-        return new OptionDefinition(shortOption, longOption, false, null, description, true, new OptionBehavior() {
-                public void behave(final EmbulkCommandLine.Builder commandLineBuilder, final String argument)
-                {
-                }
-            });
-    }
-
-    @Override
-    final Option getCliOption()
-    {
-        return this.cliOption;
-    }
-
-    final void behave(final EmbulkCommandLine.Builder commandLineBuilder, final String argument)
-            throws EmbulkCommandLineParseException
-    {
-        this.behavior.behave(commandLineBuilder, argument);
-    }
-
-    final boolean printsHelp()
-    {
-        return this.printsHelp;
-    }
-
-    private final Option cliOption;
-    private final boolean printsHelp;
-    private final OptionBehavior behavior;
-}