embulk-input-http 0.0.20 → 0.21.0

data/src/main/java/org/embulk/input/http/PagerOption.java

@@ -7,89 +7,86 @@ import com.google.common.base.Optional;
 import java.util.ArrayList;
 import java.util.List;
 
-public class PagerOption
-{
-    private final String fromParam;
-    private final Optional<String> toParam;
-    private final int start;
-    private final int pages;
-    private final int step;
+public class PagerOption {
+  private final String fromParam;
+  private final Optional<String> toParam;
+  private final int start;
+  private final int pages;
+  private final int step;
 
-    @JsonCreator
-    public PagerOption(@JsonProperty("from_param") String fromParam,
-            @JsonProperty("to_param") Optional<String> toParam,
-            @JsonProperty("start") Optional<Integer> start,
-            @JsonProperty("pages") int pages,
-            @JsonProperty("step") Optional<Integer> step)
-    {
-        this.fromParam = fromParam;
-        this.toParam = toParam;
-        this.start = start.or(0);
-        this.pages = pages;
-        this.step = step.or(1);
-    }
+  @JsonCreator
+  public PagerOption(
+      @JsonProperty("from_param") String fromParam,
+      @JsonProperty("to_param") Optional<String> toParam,
+      @JsonProperty("start") Optional<Integer> start,
+      @JsonProperty("pages") int pages,
+      @JsonProperty("step") Optional<Integer> step) {
+    this.fromParam = fromParam;
+    this.toParam = toParam;
+    this.start = start.or(0);
+    this.pages = pages;
+    this.step = step.or(1);
+  }
 
-    public List<List<QueryOption.Query>> expand()
-    {
-        List<List<QueryOption.Query>> queries = new ArrayList<>();
-        int p = 1;
-        int index = start;
-        while (p <= pages) {
-            List<QueryOption.Query> one = new ArrayList<>();
-            one.add(new QueryOption.Query(fromParam, Integer.toString(index)));
-            if (toParam.isPresent()) {
-                int t = index + step - 1;
-                one.add(new QueryOption.Query(toParam.get(), Integer.toString(t)));
-                index = t + 1;
-            }
-            else {
-                index += step;
-            }
-            queries.add(one);
-            p++;
-        }
-        return queries;
+  public List<List<QueryOption.Query>> expand() {
+    List<List<QueryOption.Query>> queries = new ArrayList<>();
+    int p = 1;
+    int index = start;
+    while (p <= pages) {
+      List<QueryOption.Query> one = new ArrayList<>();
+      one.add(new QueryOption.Query(fromParam, Integer.toString(index)));
+      if (toParam.isPresent()) {
+        int t = index + step - 1;
+        one.add(new QueryOption.Query(toParam.get(), Integer.toString(t)));
+        index = t + 1;
+      } else {
+        index += step;
+      }
+      queries.add(one);
+      p++;
     }
+    return queries;
+  }
 
-    @JsonProperty("from_param")
-    public String getFromParam()
-    {
-        return fromParam;
-    }
+  @JsonProperty("from_param")
+  public String getFromParam() {
+    return fromParam;
+  }
 
-    @JsonProperty("to_param")
-    public Optional<String> getToParam()
-    {
-        return toParam;
-    }
+  @JsonProperty("to_param")
+  public Optional<String> getToParam() {
+    return toParam;
+  }
 
-    @JsonProperty("start")
-    public int getStart()
-    {
-        return start;
-    }
+  @JsonProperty("start")
+  public int getStart() {
+    return start;
+  }
 
-    @JsonProperty("pages")
-    public int getPages()
-    {
-        return pages;
-    }
+  @JsonProperty("pages")
+  public int getPages() {
+    return pages;
+  }
 
-    @JsonProperty("step")
-    public int getStep()
-    {
-        return step;
-    }
+  @JsonProperty("step")
+  public int getStep() {
+    return step;
+  }
 
-    @Override
-    public String toString()
-    {
-        return "PagerOption{" +
-                "fromParam='" + fromParam + '\'' +
-                ", toParam=" + toParam +
-                ", start=" + start +
-                ", pages=" + pages +
-                ", step=" + step +
-                '}';
-    }
+  @Override
+  public String toString() {
+    return "PagerOption{"
+        + "fromParam='"
+        + fromParam
+        + '\''
+        + ", toParam="
+        + toParam
+        + ", start="
+        + start
+        + ", pages="
+        + pages
+        + ", step="
+        + step
+        + '}';
+  }
 }

data/src/main/java/org/embulk/input/http/ParamsOption.java

@@ -8,83 +8,74 @@ import com.google.common.base.Optional;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ParamsOption
-{
-    private final List<QueryOption> queries;
+public class ParamsOption {
+  private final List<QueryOption> queries;
 
-    @JsonCreator
-    public ParamsOption(List<QueryOption> queries)
-    {
-        this.queries = queries;
-    }
+  @JsonCreator
+  public ParamsOption(List<QueryOption> queries) {
+    this.queries = queries;
+  }
+
+  @JsonValue
+  public List<QueryOption> getQueries() {
+    return queries;
+  }
 
-    @JsonValue
-    public List<QueryOption> getQueries()
-    {
-        return queries;
+  public List<List<QueryOption.Query>> generateQueries(Optional<PagerOption> pagerOption) {
+    List<List<QueryOption.Query>> base = new ArrayList<>(queries.size());
+    for (QueryOption p : queries) {
+      base.add(p.expand());
     }
 
-    public List<List<QueryOption.Query>> generateQueries(Optional<PagerOption> pagerOption)
-    {
-        List<List<QueryOption.Query>> base = new ArrayList<>(queries.size());
-        for (QueryOption p : queries) {
-            base.add(p.expand());
-        }
+    int productSize = 1;
+    int baseSize = base.size();
+    for (int i = 0; i < baseSize; productSize *= base.get(i).size(), i++) {}
 
-        int productSize = 1;
-        int baseSize = base.size();
-        for (int i = 0; i < baseSize; productSize *= base.get(i).size(), i++) {
+    List<List<QueryOption.Query>> expands = new ArrayList<>(productSize);
+    for (int i = 0; i < productSize; i++) {
+      int j = 1;
+      List<QueryOption.Query> one = new ArrayList<>();
+      for (List<QueryOption.Query> list : base) {
+        QueryOption.Query pc = list.get((i / j) % list.size());
+        one.add(pc);
+        j *= list.size();
+      }
+      if (pagerOption.isPresent()) {
+        for (List<QueryOption.Query> q : pagerOption.get().expand()) {
+          expands.add(copyAndConcat(one, q));
         }
+      } else {
+        expands.add(one);
+      }
+    }
 
-        List<List<QueryOption.Query>> expands = new ArrayList<>(productSize);
-        for (int i = 0; i < productSize; i++) {
-            int j = 1;
-            List<QueryOption.Query> one = new ArrayList<>();
-            for (List<QueryOption.Query> list : base) {
-                QueryOption.Query pc = list.get((i / j) % list.size());
-                one.add(pc);
-                j *= list.size();
-            }
-            if (pagerOption.isPresent()) {
-                for (List<QueryOption.Query> q : pagerOption.get().expand()) {
-                    expands.add(copyAndConcat(one, q));
-                }
-            }
-            else {
-                expands.add(one);
-            }
-        }
+    return expands;
+  }
 
-        return expands;
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
     }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof ParamsOption)) {
-            return false;
-        }
-        ParamsOption other = (ParamsOption) obj;
-        return Objects.equal(queries, other.queries);
+    if (!(obj instanceof ParamsOption)) {
+      return false;
     }
+    ParamsOption other = (ParamsOption) obj;
+    return Objects.equal(queries, other.queries);
+  }
 
-    @Override
-    public int hashCode()
-    {
-        return Objects.hashCode(queries);
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(queries);
+  }
 
-    private List<QueryOption.Query> copyAndConcat(List<QueryOption.Query>... srcs)
-    {
-        List<QueryOption.Query> dest = new ArrayList<>();
-        for (List<QueryOption.Query> src : srcs) {
-            for (QueryOption.Query q : src) {
-                dest.add(q.copy());
-            }
-        }
-        return dest;
+  private List<QueryOption.Query> copyAndConcat(List<QueryOption.Query>... srcs) {
+    List<QueryOption.Query> dest = new ArrayList<>();
+    for (List<QueryOption.Query> src : srcs) {
+      for (QueryOption.Query q : src) {
+        dest.add(q.copy());
+      }
     }
+    return dest;
+  }
 }

data/src/main/java/org/embulk/input/http/QueryOption.java

@@ -9,184 +9,161 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-public class QueryOption
-{
-    private final String name;
-    private final Optional<String> value;
-    private final Optional<List<String>> values;
-    private final boolean expand;
-
-    @JsonCreator
-    public QueryOption(@JsonProperty("name") String name,
-            @JsonProperty("value") Optional<String> value,
-            @JsonProperty("values") Optional<List<String>> values,
-            @JsonProperty("expand") boolean expand)
-    {
-        this.name = name;
-        this.value = value;
-        this.values = values;
-        this.expand = expand;
-    }
-
-    public List<Query> expand()
-    {
-        List<Query> dest;
-        if (value.isPresent()) {
-            if (expand) {
-                List<String> expanded = BraceExpansion.expand(value.get());
-                dest = new ArrayList<>(expanded.size());
-                for (String s : expanded) {
-                    dest.add(new Query(name, s));
-                }
-            }
-            else {
-                dest = new ArrayList<>(1);
-                dest.add(new Query(name, value.get()));
-            }
+public class QueryOption {
+  private final String name;
+  private final Optional<String> value;
+  private final Optional<List<String>> values;
+  private final boolean expand;
+
+  @JsonCreator
+  public QueryOption(
+      @JsonProperty("name") String name,
+      @JsonProperty("value") Optional<String> value,
+      @JsonProperty("values") Optional<List<String>> values,
+      @JsonProperty("expand") boolean expand) {
+    this.name = name;
+    this.value = value;
+    this.values = values;
+    this.expand = expand;
+  }
+
+  public List<Query> expand() {
+    List<Query> dest;
+    if (value.isPresent()) {
+      if (expand) {
+        List<String> expanded = BraceExpansion.expand(value.get());
+        dest = new ArrayList<>(expanded.size());
+        for (String s : expanded) {
+          dest.add(new Query(name, s));
         }
-        else if (values.isPresent()) {
-            if (expand) {
-                dest = new ArrayList<>(values.get().size());
-                for (String s : values.get()) {
-                    dest.add(new Query(name, s));
-                }
-            }
-            else {
-                dest = new ArrayList<>(1);
-                final String[] valueArr = values.get().toArray(new String[values.get().size()]);
-                dest.add(new Query(name, valueArr));
-            }
+      } else {
+        dest = new ArrayList<>(1);
+        dest.add(new Query(name, value.get()));
+      }
+    } else if (values.isPresent()) {
+      if (expand) {
+        dest = new ArrayList<>(values.get().size());
+        for (String s : values.get()) {
+          dest.add(new Query(name, s));
         }
-        else {
-            throw new IllegalArgumentException("value or values must be specified to 'params'");
-        }
-        return dest;
+      } else {
+        dest = new ArrayList<>(1);
+        final String[] valueArr = values.get().toArray(new String[values.get().size()]);
+        dest.add(new Query(name, valueArr));
+      }
+    } else {
+      throw new IllegalArgumentException("value or values must be specified to 'params'");
     }
-
-    @JsonProperty("name")
-    public String getName()
-    {
-        return name;
+    return dest;
+  }
+
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+
+  @JsonProperty("value")
+  public Optional<String> getValue() {
+    return value;
+  }
+
+  @JsonProperty("expand")
+  public boolean isExpand() {
+    return expand;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
     }
-
-    @JsonProperty("value")
-    public Optional<String> getValue()
-    {
-        return value;
+    if (!(obj instanceof QueryOption)) {
+      return false;
     }
+    QueryOption other = (QueryOption) obj;
+    return Objects.equal(this.name, other.name)
+        && Objects.equal(value, other.value)
+        && Objects.equal(expand, other.expand);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(name, value, expand);
+  }
+
+  @Override
+  public String toString() {
+    return String.format("ParameterConfig[%s, %s, %s]", getName(), getValue(), isExpand());
+  }
+
+  public static class Query {
+    private final String name;
+    private final String[] values;
 
-    @JsonProperty("expand")
-    public boolean isExpand()
-    {
-        return expand;
+    public Query(@JsonProperty("name") String name, @JsonProperty("values") String... values) {
+      this.name = name;
+      this.values = values;
     }
 
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof QueryOption)) {
-            return false;
-        }
-        QueryOption other = (QueryOption) obj;
-        return Objects.equal(this.name, other.name) &&
-                Objects.equal(value, other.value) &&
-                Objects.equal(expand, other.expand);
+    public String getName() {
+      return name;
     }
 
-    @Override
-    public int hashCode()
-    {
-        return Objects.hashCode(name, value, expand);
+    public String[] getValues() {
+      return values;
     }
 
-    @Override
-    public String toString()
-    {
-        return String.format("ParameterConfig[%s, %s, %s]",
-                getName(), getValue(), isExpand());
+    public Query copy() {
+      return new Query(this.name, Arrays.copyOf(this.values, this.values.length));
     }
+  }
 
-    public static class Query
-    {
-        private final String name;
-        private final String[] values;
-
-        public Query(@JsonProperty("name") String name,
-                @JsonProperty("values") String... values)
-        {
-            this.name = name;
-            this.values = values;
-        }
-
-        public String getName()
-        {
-            return name;
-        }
-
-        public String[] getValues()
-        {
-            return values;
-        }
-
-        public Query copy()
-        {
-            return new Query(this.name, Arrays.copyOf(this.values, this.values.length));
-        }
+  private static class BraceExpansion {
+    public static List<String> expand(String s) {
+      return expandRecursive("", s, "", new ArrayList<String>());
     }
 
-    private static class BraceExpansion
-    {
-        public static List<String> expand(String s)
-        {
-            return expandRecursive("", s, "", new ArrayList<String>());
+    private static List<String> expandRecursive(
+        String prefix, String s, String suffix, List<String> dest) {
+      // used the code below as reference.
+      //  http://rosettacode.org/wiki/Brace_expansion#Java
+      int i1 = -1;
+      int i2 = 0;
+      String noEscape = s.replaceAll("([\\\\]{2}|[\\\\][,}{])", "  ");
+      StringBuilder sb = null;
+
+      outer:
+      while ((i1 = noEscape.indexOf('{', i1 + 1)) != -1) {
+        i2 = i1 + 1;
+        sb = new StringBuilder(s);
+        for (int depth = 1; i2 < s.length() && depth > 0; i2++) {
+          char c = noEscape.charAt(i2);
+          depth = (c == '{') ? ++depth : depth;
+          depth = (c == '}') ? --depth : depth;
+          if (c == ',' && depth == 1) {
+            sb.setCharAt(i2, '\u0000');
+          } else if (c == '}' && depth == 0 && sb.indexOf("\u0000") != -1) {
+            break outer;
+          }
         }
-
-        private static List<String> expandRecursive(String prefix, String s,
-                                                    String suffix, List<String> dest)
-        {
-            // used the code below as reference.
-            //  http://rosettacode.org/wiki/Brace_expansion#Java
-            int i1 = -1;
-            int i2 = 0;
-            String noEscape = s.replaceAll("([\\\\]{2}|[\\\\][,}{])", "  ");
-            StringBuilder sb = null;
-
-            outer:
-            while ((i1 = noEscape.indexOf('{', i1 + 1)) != -1) {
-                i2 = i1 + 1;
-                sb = new StringBuilder(s);
-                for (int depth = 1; i2 < s.length() && depth > 0; i2++) {
-                    char c = noEscape.charAt(i2);
-                    depth = (c == '{') ? ++depth : depth;
-                    depth = (c == '}') ? --depth : depth;
-                    if (c == ',' && depth == 1) {
-                        sb.setCharAt(i2, '\u0000');
-                    }
-                    else if (c == '}' && depth == 0 && sb.indexOf("\u0000") != -1) {
-                        break outer;
-                    }
-                }
-            }
-
-            if (i1 == -1) {
-                if (suffix.length() > 0) {
-                    expandRecursive(prefix + s, suffix, "", dest);
-                }
-                else {
-                    final String out = String.format("%s%s%s", prefix, s, suffix).
-                            replaceAll("[\\\\]{2}", "\\").replaceAll("[\\\\]([,}{])", "$1");
-                    dest.add(out);
-                }
-            }
-            else {
-                for (String m : sb.substring(i1 + 1, i2).split("\u0000", -1)) {
-                    expandRecursive(prefix + s.substring(0, i1), m, s.substring(i2 + 1) + suffix, dest);
-                }
-            }
-            return dest;
+      }
+
+      if (i1 == -1) {
+        if (suffix.length() > 0) {
+          expandRecursive(prefix + s, suffix, "", dest);
+        } else {
+          final String out =
+              String.format("%s%s%s", prefix, s, suffix)
+                  .replaceAll("[\\\\]{2}", "\\")
+                  .replaceAll("[\\\\]([,}{])", "$1");
+          dest.add(out);
+        }
+      } else {
+        for (String m : sb.substring(i1 + 1, i2).split("\u0000", -1)) {
+          expandRecursive(prefix + s.substring(0, i1), m, s.substring(i2 + 1) + suffix, dest);
         }
+      }
+      return dest;
     }
+  }
 }