embulk-input-http 0.0.15 → 0.0.17

data/src/main/java/org/embulk/input/http/{PagerConfig.java → PagerOption.java}

@@ -7,8 +7,8 @@ import com.google.common.base.Optional;
 import java.util.ArrayList;
 import java.util.List;
 
-public class PagerConfig {
-
+public class PagerOption
+{
     private final String fromParam;
     private final Optional<String> toParam;
     private final int start;
@@ -16,11 +16,12 @@ public class PagerConfig {
     private final int step;
 
     @JsonCreator
-    public PagerConfig(@JsonProperty("from_param") String fromParam,
+    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) {
+            @JsonProperty("step") Optional<Integer> step)
+    {
         this.fromParam = fromParam;
         this.toParam = toParam;
         this.start = start.or(0);
@@ -28,18 +29,20 @@ public class PagerConfig {
         this.step = step.or(1);
     }
 
-    public List<List<QueryConfig.Query>> expand() {
-        List<List<QueryConfig.Query>> queries = new ArrayList<>();
+    public List<List<QueryOption.Query>> expand()
+    {
+        List<List<QueryOption.Query>> queries = new ArrayList<>();
         int p = 1;
         int index = start;
         while (p <= pages) {
-            List<QueryConfig.Query> one = new ArrayList<>();
-            one.add(new QueryConfig.Query(fromParam, Integer.toString(index)));
+            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 QueryConfig.Query(toParam.get(), Integer.toString(t)));
+                one.add(new QueryOption.Query(toParam.get(), Integer.toString(t)));
                 index = t + 1;
-            } else {
+            }
+            else {
                 index += step;
             }
             queries.add(one);
@@ -49,33 +52,39 @@ public class PagerConfig {
     }
 
     @JsonProperty("from_param")
-    public String getFromParam() {
+    public String getFromParam()
+    {
         return fromParam;
     }
 
     @JsonProperty("to_param")
-    public Optional<String> getToParam() {
+    public Optional<String> getToParam()
+    {
         return toParam;
     }
 
     @JsonProperty("start")
-    public int getStart() {
+    public int getStart()
+    {
         return start;
     }
 
     @JsonProperty("pages")
-    public int getPages() {
+    public int getPages()
+    {
         return pages;
     }
 
     @JsonProperty("step")
-    public int getStep() {
+    public int getStep()
+    {
         return step;
     }
 
     @Override
-    public String toString() {
-        return "PagerConfig{" +
+    public String toString()
+    {
+        return "PagerOption{" +
                 "fromParam='" + fromParam + '\'' +
                 ", toParam=" + toParam +
                 ", start=" + start +

data/src/main/java/org/embulk/input/http/{ParamsConfig.java → ParamsOption.java}

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

data/src/main/java/org/embulk/input/http/{QueryConfig.java → QueryOption.java}

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

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

@@ -11,41 +11,40 @@ import org.embulk.spi.util.RetryExecutor;
 import org.slf4j.Logger;
 
 import javax.net.ssl.SSLException;
+
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.UnknownHostException;
 import java.util.List;
 
-public class RetryableHandler implements RetryExecutor.Retryable {
-
+public class RetryableHandler implements RetryExecutor.Retryable
+{
     protected final Logger logger = Exec.getLogger(getClass());
 
-    private static List<Class<? extends IOException>> NOT_RETRIABLE_CLAASSES;
+    private static final List<Class<? extends IOException>> NOT_RETRIABLE_CLASSES = ImmutableList.of(UnknownHostException.class,
+            InterruptedIOException.class, SSLException.class);
 
     private final HttpClient client;
     private final HttpRequestBase request;
     private HttpResponse response;
 
-    static {
-        ImmutableList.Builder<Class<? extends IOException>> classes = ImmutableList.builder();
-        classes.add(UnknownHostException.class).
-                add(InterruptedIOException.class).
-                add(SSLException.class);
-        NOT_RETRIABLE_CLAASSES = classes.build();
-    }
-
-    public RetryableHandler(HttpClient client, HttpRequestBase request) {
+    public RetryableHandler(HttpClient client, HttpRequestBase request)
+    {
         this.client = client;
         this.request = request;
     }
 
-    public HttpResponse getResponse() {
+    public HttpResponse getResponse()
+    {
         return response;
     }
 
     @Override
-    public Object call() throws Exception {
-        if (response != null) throw new IllegalStateException("response is already set");
+    public Object call() throws Exception
+    {
+        if (response != null) {
+            throw new IllegalStateException("response is already set");
+        }
         HttpResponse response = client.execute(request);
         statusIsOkOrThrow(response);
         this.response = response;
@@ -53,8 +52,9 @@ public class RetryableHandler implements RetryExecutor.Retryable {
     }
 
     @Override
-    public boolean isRetryableException(Exception exception) {
-        if (NOT_RETRIABLE_CLAASSES.contains(exception.getClass())) {
+    public boolean isRetryableException(Exception exception)
+    {
+        if (NOT_RETRIABLE_CLASSES.contains(exception.getClass())) {
             logger.error(String.format("'%s' is not retriable", exception.getClass()));
             return false;
         }
@@ -63,7 +63,8 @@ public class RetryableHandler implements RetryExecutor.Retryable {
 
     @Override
     public void onRetry(Exception exception, int retryCount, int retryLimit, int retryWait)
-            throws RetryExecutor.RetryGiveupException {
+            throws RetryExecutor.RetryGiveupException
+    {
         logger.warn("retrying {}/{} after {} seconds. Message: {}",
                 retryCount, retryLimit, retryWait / 1000,
                 exception.getMessage());
@@ -71,12 +72,14 @@ public class RetryableHandler implements RetryExecutor.Retryable {
 
     @Override
     public void onGiveup(Exception firstException, Exception lastException)
-            throws RetryExecutor.RetryGiveupException {
+            throws RetryExecutor.RetryGiveupException
+    {
         logger.error("giveup {}", lastException.getMessage());
     }
 
     protected void statusIsOkOrThrow(HttpResponse response)
-            throws HttpException, IOException {
+            throws HttpException, IOException
+    {
         int code = response.getStatusLine().getStatusCode();
         switch (response.getStatusLine().getStatusCode()) {
             case 200:
@@ -86,5 +89,4 @@ public class RetryableHandler implements RetryExecutor.Retryable {
                         code, EntityUtils.toString(response.getEntity())));
         }
     }
-
 }