embulk-input-http 0.0.20 → 0.21.0

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

@@ -11,82 +11,76 @@ 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
-{
-    protected final Logger logger = Exec.getLogger(getClass());
-
-    private static final List<Class<? extends IOException>> NOT_RETRIABLE_CLASSES = ImmutableList.of(UnknownHostException.class,
-            InterruptedIOException.class, SSLException.class);
+public class RetryableHandler implements RetryExecutor.Retryable {
+  private static final List<Class<? extends IOException>> NOT_RETRIABLE_CLASSES =
+      ImmutableList.of(
+          UnknownHostException.class, InterruptedIOException.class, SSLException.class);
+  protected final Logger logger = Exec.getLogger(getClass());
+  private final HttpClient client;
+  private final HttpRequestBase request;
+  private HttpResponse response;
 
-    private final HttpClient client;
-    private final HttpRequestBase request;
-    private HttpResponse response;
+  public RetryableHandler(HttpClient client, HttpRequestBase request) {
+    this.client = client;
+    this.request = request;
+  }
 
-    public RetryableHandler(HttpClient client, HttpRequestBase request)
-    {
-        this.client = client;
-        this.request = request;
-    }
+  public HttpResponse getResponse() {
+    return response;
+  }
 
-    public HttpResponse getResponse()
-    {
-        return response;
+  @Override
+  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;
+    return null;
+  }
 
-    @Override
-    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;
-        return null;
+  @Override
+  public boolean isRetryableException(Exception exception) {
+    if (NOT_RETRIABLE_CLASSES.contains(exception.getClass())) {
+      logger.error(String.format("'%s' is not retriable", exception.getClass()));
+      return false;
     }
+    return true;
+  }
 
-    @Override
-    public boolean isRetryableException(Exception exception)
-    {
-        if (NOT_RETRIABLE_CLASSES.contains(exception.getClass())) {
-            logger.error(String.format("'%s' is not retriable", exception.getClass()));
-            return false;
-        }
-        return true;
-    }
+  @Override
+  public void onRetry(Exception exception, int retryCount, int retryLimit, int retryWait)
+      throws RetryExecutor.RetryGiveupException {
+    logger.warn(
+        "retrying {}/{} after {} seconds. Message: {}",
+        retryCount,
+        retryLimit,
+        retryWait / 1000,
+        exception.getMessage());
+  }
 
-    @Override
-    public void onRetry(Exception exception, int retryCount, int retryLimit, int retryWait)
-            throws RetryExecutor.RetryGiveupException
-    {
-        logger.warn("retrying {}/{} after {} seconds. Message: {}",
-                retryCount, retryLimit, retryWait / 1000,
-                exception.getMessage());
-    }
-
-    @Override
-    public void onGiveup(Exception firstException, Exception lastException)
-            throws RetryExecutor.RetryGiveupException
-    {
-        logger.error("giveup {}", lastException.getMessage());
-    }
+  @Override
+  public void onGiveup(Exception firstException, Exception lastException)
+      throws RetryExecutor.RetryGiveupException {
+    logger.error("giveup {}", lastException.getMessage());
+  }
 
-    protected void statusIsOkOrThrow(HttpResponse response)
-            throws HttpException, IOException
-    {
-        int code = response.getStatusLine().getStatusCode();
-        switch (response.getStatusLine().getStatusCode()) {
-            case 200:
-                return;
-            default:
-                throw new HttpException(String.format("Request is not successful, code=%d, body=%s",
-                        code, EntityUtils.toString(response.getEntity())));
-        }
+  protected void statusIsOkOrThrow(HttpResponse response) throws HttpException, IOException {
+    int code = response.getStatusLine().getStatusCode();
+    switch (response.getStatusLine().getStatusCode()) {
+      case 200:
+        return;
+      default:
+        throw new HttpException(
+            String.format(
+                "Request is not successful, code=%d, body=%s",
+                code, EntityUtils.toString(response.getEntity())));
     }
+  }
 }

data/src/test/java/org/embulk/input/http/TestHttpInputPlugin.java

@@ -1,5 +1,3 @@
 package org.embulk.input.http;
 
-public class TestHttpInputPlugin
-{
-}
+public class TestHttpInputPlugin {}

data/src/test/java/org/embulk/input/http/TestPagerOption.java

@@ -7,74 +7,70 @@ import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 
-public class TestPagerOption
-{
-    @Test
-    public void testExpandFromTo() throws Exception
-    {
-        List<List<QueryOption.Query>> dest = new PagerOption("from", Optional.of("to"), Optional.of(1), 3,
-                Optional.of(2)).expand();
-        assertEquals(dest.size(), 3);
+public class TestPagerOption {
+  @Test
+  public void testExpandFromTo() throws Exception {
+    List<List<QueryOption.Query>> dest =
+        new PagerOption("from", Optional.of("to"), Optional.of(1), 3, Optional.of(2)).expand();
+    assertEquals(dest.size(), 3);
 
-        assertEquals(dest.get(0).size(), 2);
-        assertEquals(dest.get(0).get(0).getName(), "from");
-        assertEquals(dest.get(0).get(0).getValues()[0], "1");
-        assertEquals(dest.get(0).get(1).getName(), "to");
-        assertEquals(dest.get(0).get(1).getValues()[0], "2");
+    assertEquals(dest.get(0).size(), 2);
+    assertEquals(dest.get(0).get(0).getName(), "from");
+    assertEquals(dest.get(0).get(0).getValues()[0], "1");
+    assertEquals(dest.get(0).get(1).getName(), "to");
+    assertEquals(dest.get(0).get(1).getValues()[0], "2");
 
-        assertEquals(dest.get(1).size(), 2);
-        assertEquals(dest.get(1).get(0).getName(), "from");
-        assertEquals(dest.get(1).get(0).getValues()[0], "3");
-        assertEquals(dest.get(1).get(1).getName(), "to");
-        assertEquals(dest.get(1).get(1).getValues()[0], "4");
+    assertEquals(dest.get(1).size(), 2);
+    assertEquals(dest.get(1).get(0).getName(), "from");
+    assertEquals(dest.get(1).get(0).getValues()[0], "3");
+    assertEquals(dest.get(1).get(1).getName(), "to");
+    assertEquals(dest.get(1).get(1).getValues()[0], "4");
 
-        assertEquals(dest.get(2).size(), 2);
-        assertEquals(dest.get(2).get(0).getName(), "from");
-        assertEquals(dest.get(2).get(0).getValues()[0], "5");
-        assertEquals(dest.get(2).get(1).getName(), "to");
-        assertEquals(dest.get(2).get(1).getValues()[0], "6");
-    }
+    assertEquals(dest.get(2).size(), 2);
+    assertEquals(dest.get(2).get(0).getName(), "from");
+    assertEquals(dest.get(2).get(0).getValues()[0], "5");
+    assertEquals(dest.get(2).get(1).getName(), "to");
+    assertEquals(dest.get(2).get(1).getValues()[0], "6");
+  }
 
-    @Test
-    public void testExpandFromToWithDefault() throws Exception
-    {
-        Optional<Integer> nullValue = Optional.absent();
+  @Test
+  public void testExpandFromToWithDefault() throws Exception {
+    Optional<Integer> nullValue = Optional.absent();
 
-        List<List<QueryOption.Query>> dest = new PagerOption("from", Optional.of("to"), nullValue, 2, nullValue)
-                .expand();
-        assertEquals(dest.size(), 2);
+    List<List<QueryOption.Query>> dest =
+        new PagerOption("from", Optional.of("to"), nullValue, 2, nullValue).expand();
+    assertEquals(dest.size(), 2);
 
-        assertEquals(dest.get(0).size(), 2);
-        assertEquals(dest.get(0).get(0).getName(), "from");
-        assertEquals(dest.get(0).get(0).getValues()[0], "0");
-        assertEquals(dest.get(0).get(1).getName(), "to");
-        assertEquals(dest.get(0).get(1).getValues()[0], "0");
+    assertEquals(dest.get(0).size(), 2);
+    assertEquals(dest.get(0).get(0).getName(), "from");
+    assertEquals(dest.get(0).get(0).getValues()[0], "0");
+    assertEquals(dest.get(0).get(1).getName(), "to");
+    assertEquals(dest.get(0).get(1).getValues()[0], "0");
 
-        assertEquals(dest.get(1).size(), 2);
-        assertEquals(dest.get(1).get(0).getName(), "from");
-        assertEquals(dest.get(1).get(0).getValues()[0], "1");
-        assertEquals(dest.get(1).get(1).getName(), "to");
-        assertEquals(dest.get(1).get(1).getValues()[0], "1");
-    }
+    assertEquals(dest.get(1).size(), 2);
+    assertEquals(dest.get(1).get(0).getName(), "from");
+    assertEquals(dest.get(1).get(0).getValues()[0], "1");
+    assertEquals(dest.get(1).get(1).getName(), "to");
+    assertEquals(dest.get(1).get(1).getValues()[0], "1");
+  }
 
-    @Test
-    public void testExpandPagenate() throws Exception
-    {
-        Optional<String> nullValue = Optional.absent();
-        List<List<QueryOption.Query>> dest = new PagerOption("page", nullValue, Optional.of(1), 3,
-                Optional.of(1)).expand();
-        assertEquals(dest.size(), 3);
+  @Test
+  public void testExpandPagenate() throws Exception {
+    Optional<String> nullValue = Optional.absent();
+    List<List<QueryOption.Query>> dest =
+        new PagerOption("page", nullValue, Optional.of(1), 3, Optional.of(1)).expand();
+    assertEquals(dest.size(), 3);
 
-        assertEquals(dest.get(0).size(), 1);
-        assertEquals(dest.get(0).get(0).getName(), "page");
-        assertEquals(dest.get(0).get(0).getValues()[0], "1");
+    assertEquals(dest.get(0).size(), 1);
+    assertEquals(dest.get(0).get(0).getName(), "page");
+    assertEquals(dest.get(0).get(0).getValues()[0], "1");
 
-        assertEquals(dest.get(1).size(), 1);
-        assertEquals(dest.get(1).get(0).getName(), "page");
-        assertEquals(dest.get(1).get(0).getValues()[0], "2");
+    assertEquals(dest.get(1).size(), 1);
+    assertEquals(dest.get(1).get(0).getName(), "page");
+    assertEquals(dest.get(1).get(0).getValues()[0], "2");
 
-        assertEquals(dest.get(2).size(), 1);
-        assertEquals(dest.get(2).get(0).getName(), "page");
-        assertEquals(dest.get(2).get(0).getValues()[0], "3");
-    }
+    assertEquals(dest.get(2).size(), 1);
+    assertEquals(dest.get(2).get(0).getName(), "page");
+    assertEquals(dest.get(2).get(0).getValues()[0], "3");
+  }
 }

data/src/test/java/org/embulk/input/http/TestParamsOption.java

@@ -8,102 +8,97 @@ import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 
-public class TestParamsOption
-{
-    @Test
-    public void testUnexpandQueriesSinglePair() throws Exception
-    {
-        Optional<List<String>> nullValues = Optional.absent();
-        QueryOption q1 = new QueryOption("test1", Optional.of("awasome1"), nullValues, false);
-        QueryOption q2 = new QueryOption("test2", Optional.of("awasome2"), nullValues, false);
-        ParamsOption paramsOption = new ParamsOption(Lists.newArrayList(q1, q2));
-        Optional<PagerOption> pagerOption = Optional.absent();
-        List<List<QueryOption.Query>> dest = paramsOption.generateQueries(pagerOption);
-        assertEquals(dest.size(), 1);
-        assertEquals(dest.get(0).size(), 2);
-        assertEquals(dest.get(0).get(0).getName(), "test1");
-        assertEquals(dest.get(0).get(0).getValues()[0], "awasome1");
-        assertEquals(dest.get(0).get(1).getName(), "test2");
-        assertEquals(dest.get(0).get(1).getValues()[0], "awasome2");
-    }
+public class TestParamsOption {
+  @Test
+  public void testUnexpandQueriesSinglePair() throws Exception {
+    Optional<List<String>> nullValues = Optional.absent();
+    QueryOption q1 = new QueryOption("test1", Optional.of("awasome1"), nullValues, false);
+    QueryOption q2 = new QueryOption("test2", Optional.of("awasome2"), nullValues, false);
+    ParamsOption paramsOption = new ParamsOption(Lists.newArrayList(q1, q2));
+    Optional<PagerOption> pagerOption = Optional.absent();
+    List<List<QueryOption.Query>> dest = paramsOption.generateQueries(pagerOption);
+    assertEquals(dest.size(), 1);
+    assertEquals(dest.get(0).size(), 2);
+    assertEquals(dest.get(0).get(0).getName(), "test1");
+    assertEquals(dest.get(0).get(0).getValues()[0], "awasome1");
+    assertEquals(dest.get(0).get(1).getName(), "test2");
+    assertEquals(dest.get(0).get(1).getValues()[0], "awasome2");
+  }
 
-    @Test
-    public void testUnexpandQueriesExpandPair() throws Exception
-    {
-        Optional<String> nullValue = Optional.absent();
-        List<String> values1 = Lists.newArrayList("a", "b");
-        List<String> values2 = Lists.newArrayList("c", "d");
+  @Test
+  public void testUnexpandQueriesExpandPair() throws Exception {
+    Optional<String> nullValue = Optional.absent();
+    List<String> values1 = Lists.newArrayList("a", "b");
+    List<String> values2 = Lists.newArrayList("c", "d");
 
-        QueryOption q1 = new QueryOption("test1", nullValue, Optional.of(values1), false);
-        QueryOption q2 = new QueryOption("test2", nullValue, Optional.of(values2), false);
+    QueryOption q1 = new QueryOption("test1", nullValue, Optional.of(values1), false);
+    QueryOption q2 = new QueryOption("test2", nullValue, Optional.of(values2), false);
 
-        ParamsOption paramsOption = new ParamsOption(Lists.newArrayList(q1, q2));
-        Optional<PagerOption> pagerOption = Optional.absent();
-        List<List<QueryOption.Query>> dest = paramsOption.generateQueries(pagerOption);
-        assertEquals(dest.size(), 1);
-        assertEquals(dest.get(0).size(), 2);
-        assertEquals(dest.get(0).get(0).getName(), "test1");
-        assertEquals(dest.get(0).get(0).getValues()[0], "a");
-        assertEquals(dest.get(0).get(0).getValues()[1], "b");
-        assertEquals(dest.get(0).get(1).getName(), "test2");
-        assertEquals(dest.get(0).get(1).getValues()[0], "c");
-        assertEquals(dest.get(0).get(1).getValues()[1], "d");
-    }
+    ParamsOption paramsOption = new ParamsOption(Lists.newArrayList(q1, q2));
+    Optional<PagerOption> pagerOption = Optional.absent();
+    List<List<QueryOption.Query>> dest = paramsOption.generateQueries(pagerOption);
+    assertEquals(dest.size(), 1);
+    assertEquals(dest.get(0).size(), 2);
+    assertEquals(dest.get(0).get(0).getName(), "test1");
+    assertEquals(dest.get(0).get(0).getValues()[0], "a");
+    assertEquals(dest.get(0).get(0).getValues()[1], "b");
+    assertEquals(dest.get(0).get(1).getName(), "test2");
+    assertEquals(dest.get(0).get(1).getValues()[0], "c");
+    assertEquals(dest.get(0).get(1).getValues()[1], "d");
+  }
 
-    @Test
-    public void testExpandQueriesSinglePair() throws Exception
-    {
-        Optional<List<String>> nullValues = Optional.absent();
-        QueryOption q1 = new QueryOption("test1", Optional.of("awasome1"), nullValues, true);
-        QueryOption q2 = new QueryOption("test2", Optional.of("awasome2"), nullValues, true);
-        ParamsOption paramsOption = new ParamsOption(Lists.newArrayList(q1, q2));
-        Optional<PagerOption> pagerOption = Optional.absent();
-        List<List<QueryOption.Query>> dest = paramsOption.generateQueries(pagerOption);
-        assertEquals(dest.size(), 1);
-        assertEquals(dest.get(0).size(), 2);
-        assertEquals(dest.get(0).get(0).getName(), "test1");
-        assertEquals(dest.get(0).get(0).getValues()[0], "awasome1");
-        assertEquals(dest.get(0).get(1).getName(), "test2");
-        assertEquals(dest.get(0).get(1).getValues()[0], "awasome2");
-    }
+  @Test
+  public void testExpandQueriesSinglePair() throws Exception {
+    Optional<List<String>> nullValues = Optional.absent();
+    QueryOption q1 = new QueryOption("test1", Optional.of("awasome1"), nullValues, true);
+    QueryOption q2 = new QueryOption("test2", Optional.of("awasome2"), nullValues, true);
+    ParamsOption paramsOption = new ParamsOption(Lists.newArrayList(q1, q2));
+    Optional<PagerOption> pagerOption = Optional.absent();
+    List<List<QueryOption.Query>> dest = paramsOption.generateQueries(pagerOption);
+    assertEquals(dest.size(), 1);
+    assertEquals(dest.get(0).size(), 2);
+    assertEquals(dest.get(0).get(0).getName(), "test1");
+    assertEquals(dest.get(0).get(0).getValues()[0], "awasome1");
+    assertEquals(dest.get(0).get(1).getName(), "test2");
+    assertEquals(dest.get(0).get(1).getValues()[0], "awasome2");
+  }
 
-    @Test
-    public void testExpandQueriesExpandPair() throws Exception
-    {
-        Optional<String> nullValue = Optional.absent();
-        List<String> values1 = Lists.newArrayList("a", "b");
-        List<String> values2 = Lists.newArrayList("c", "d");
+  @Test
+  public void testExpandQueriesExpandPair() throws Exception {
+    Optional<String> nullValue = Optional.absent();
+    List<String> values1 = Lists.newArrayList("a", "b");
+    List<String> values2 = Lists.newArrayList("c", "d");
 
-        QueryOption q1 = new QueryOption("test1", nullValue, Optional.of(values1), true);
-        QueryOption q2 = new QueryOption("test2", nullValue, Optional.of(values2), true);
+    QueryOption q1 = new QueryOption("test1", nullValue, Optional.of(values1), true);
+    QueryOption q2 = new QueryOption("test2", nullValue, Optional.of(values2), true);
 
-        ParamsOption paramsOption = new ParamsOption(Lists.newArrayList(q1, q2));
-        Optional<PagerOption> pagerOption = Optional.absent();
-        List<List<QueryOption.Query>> dest = paramsOption.generateQueries(pagerOption);
-        assertEquals(dest.size(), 4);
+    ParamsOption paramsOption = new ParamsOption(Lists.newArrayList(q1, q2));
+    Optional<PagerOption> pagerOption = Optional.absent();
+    List<List<QueryOption.Query>> dest = paramsOption.generateQueries(pagerOption);
+    assertEquals(dest.size(), 4);
 
-        assertEquals(dest.get(0).size(), 2);
-        assertEquals(dest.get(0).get(0).getName(), "test1");
-        assertEquals(dest.get(0).get(0).getValues()[0], "a");
-        assertEquals(dest.get(0).get(1).getName(), "test2");
-        assertEquals(dest.get(0).get(1).getValues()[0], "c");
+    assertEquals(dest.get(0).size(), 2);
+    assertEquals(dest.get(0).get(0).getName(), "test1");
+    assertEquals(dest.get(0).get(0).getValues()[0], "a");
+    assertEquals(dest.get(0).get(1).getName(), "test2");
+    assertEquals(dest.get(0).get(1).getValues()[0], "c");
 
-        assertEquals(dest.get(1).size(), 2);
-        assertEquals(dest.get(1).get(0).getName(), "test1");
-        assertEquals(dest.get(1).get(0).getValues()[0], "b");
-        assertEquals(dest.get(1).get(1).getName(), "test2");
-        assertEquals(dest.get(1).get(1).getValues()[0], "c");
+    assertEquals(dest.get(1).size(), 2);
+    assertEquals(dest.get(1).get(0).getName(), "test1");
+    assertEquals(dest.get(1).get(0).getValues()[0], "b");
+    assertEquals(dest.get(1).get(1).getName(), "test2");
+    assertEquals(dest.get(1).get(1).getValues()[0], "c");
 
-        assertEquals(dest.get(2).size(), 2);
-        assertEquals(dest.get(2).get(0).getName(), "test1");
-        assertEquals(dest.get(2).get(0).getValues()[0], "a");
-        assertEquals(dest.get(2).get(1).getName(), "test2");
-        assertEquals(dest.get(2).get(1).getValues()[0], "d");
+    assertEquals(dest.get(2).size(), 2);
+    assertEquals(dest.get(2).get(0).getName(), "test1");
+    assertEquals(dest.get(2).get(0).getValues()[0], "a");
+    assertEquals(dest.get(2).get(1).getName(), "test2");
+    assertEquals(dest.get(2).get(1).getValues()[0], "d");
 
-        assertEquals(dest.get(3).size(), 2);
-        assertEquals(dest.get(3).get(0).getName(), "test1");
-        assertEquals(dest.get(3).get(0).getValues()[0], "b");
-        assertEquals(dest.get(3).get(1).getName(), "test2");
-        assertEquals(dest.get(3).get(1).getValues()[0], "d");
-    }
+    assertEquals(dest.get(3).size(), 2);
+    assertEquals(dest.get(3).get(0).getName(), "test1");
+    assertEquals(dest.get(3).get(0).getValues()[0], "b");
+    assertEquals(dest.get(3).get(1).getName(), "test2");
+    assertEquals(dest.get(3).get(1).getValues()[0], "d");
+  }
 }