embulk-input-http 0.0.15 → 0.0.17

data/src/test/java/org/embulk/input/http/{TestPagerConfig.java → TestPagerOption.java}

@@ -7,11 +7,12 @@ import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 
-public class TestPagerConfig {
-
+public class TestPagerOption
+{
     @Test
-    public void testExpandFromTo() throws Exception {
-        List<List<QueryConfig.Query>> dest = new PagerConfig("from", Optional.of("to"), Optional.of(1), 3,
+    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);
 
@@ -35,10 +36,11 @@ public class TestPagerConfig {
     }
 
     @Test
-    public void testExpandFromToWithDefault() throws Exception {
+    public void testExpandFromToWithDefault() throws Exception
+    {
         Optional<Integer> nullValue = Optional.absent();
 
-        List<List<QueryConfig.Query>> dest = new PagerConfig("from", Optional.of("to"), nullValue, 2, nullValue)
+        List<List<QueryOption.Query>> dest = new PagerOption("from", Optional.of("to"), nullValue, 2, nullValue)
                 .expand();
         assertEquals(dest.size(), 2);
 
@@ -56,9 +58,10 @@ public class TestPagerConfig {
     }
 
     @Test
-    public void testExpandPagenate() throws Exception {
+    public void testExpandPagenate() throws Exception
+    {
         Optional<String> nullValue = Optional.absent();
-        List<List<QueryConfig.Query>> dest = new PagerConfig("page", nullValue, Optional.of(1), 3,
+        List<List<QueryOption.Query>> dest = new PagerOption("page", nullValue, Optional.of(1), 3,
                 Optional.of(1)).expand();
         assertEquals(dest.size(), 3);
 
@@ -74,5 +77,4 @@ public class TestPagerConfig {
         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/{TestParamsConfig.java → TestParamsOption.java}

@@ -8,16 +8,17 @@ import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 
-public class TestParamsConfig {
-
+public class TestParamsOption
+{
     @Test
-    public void testUnexpandQueriesSinglePair() throws Exception {
+    public void testUnexpandQueriesSinglePair() throws Exception
+    {
         Optional<List<String>> nullValues = Optional.absent();
-        QueryConfig q1 = new QueryConfig("test1", Optional.of("awasome1"), nullValues, false);
-        QueryConfig q2 = new QueryConfig("test2", Optional.of("awasome2"), nullValues, false);
-        ParamsConfig paramsConfig = new ParamsConfig(Lists.newArrayList(q1, q2));
-        Optional<PagerConfig> pagerConfig = Optional.absent();
-        List<List<QueryConfig.Query>> dest = paramsConfig.generateQueries(pagerConfig);
+        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");
@@ -27,17 +28,18 @@ public class TestParamsConfig {
     }
 
     @Test
-    public void testUnexpandQueriesExpandPair() throws Exception {
+    public void testUnexpandQueriesExpandPair() throws Exception
+    {
         Optional<String> nullValue = Optional.absent();
         List<String> values1 = Lists.newArrayList("a", "b");
         List<String> values2 = Lists.newArrayList("c", "d");
 
-        QueryConfig q1 = new QueryConfig("test1", nullValue, Optional.of(values1), false);
-        QueryConfig q2 = new QueryConfig("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);
 
-        ParamsConfig paramsConfig = new ParamsConfig(Lists.newArrayList(q1, q2));
-        Optional<PagerConfig> pagerConfig = Optional.absent();
-        List<List<QueryConfig.Query>> dest = paramsConfig.generateQueries(pagerConfig);
+        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");
@@ -49,13 +51,14 @@ public class TestParamsConfig {
     }
 
     @Test
-    public void testExpandQueriesSinglePair() throws Exception {
+    public void testExpandQueriesSinglePair() throws Exception
+    {
         Optional<List<String>> nullValues = Optional.absent();
-        QueryConfig q1 = new QueryConfig("test1", Optional.of("awasome1"), nullValues, true);
-        QueryConfig q2 = new QueryConfig("test2", Optional.of("awasome2"), nullValues, true);
-        ParamsConfig paramsConfig = new ParamsConfig(Lists.newArrayList(q1, q2));
-        Optional<PagerConfig> pagerConfig = Optional.absent();
-        List<List<QueryConfig.Query>> dest = paramsConfig.generateQueries(pagerConfig);
+        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");
@@ -65,17 +68,18 @@ public class TestParamsConfig {
     }
 
     @Test
-    public void testExpandQueriesExpandPair() throws Exception {
+    public void testExpandQueriesExpandPair() throws Exception
+    {
         Optional<String> nullValue = Optional.absent();
         List<String> values1 = Lists.newArrayList("a", "b");
         List<String> values2 = Lists.newArrayList("c", "d");
 
-        QueryConfig q1 = new QueryConfig("test1", nullValue, Optional.of(values1), true);
-        QueryConfig q2 = new QueryConfig("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);
 
-        ParamsConfig paramsConfig = new ParamsConfig(Lists.newArrayList(q1, q2));
-        Optional<PagerConfig> pagerConfig = Optional.absent();
-        List<List<QueryConfig.Query>> dest = paramsConfig.generateQueries(pagerConfig);
+        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);
@@ -102,4 +106,4 @@ public class TestParamsConfig {
         assertEquals(dest.get(3).get(1).getName(), "test2");
         assertEquals(dest.get(3).get(1).getValues()[0], "d");
     }
-}
+}

data/src/test/java/org/embulk/input/http/{TestQueryConfig.java → TestQueryOption.java}

@@ -8,13 +8,14 @@ import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 
-public class TestQueryConfig {
-
+public class TestQueryOption
+{
     @Test
-    public void testUnexpandSingleValue() throws Exception {
+    public void testUnexpandSingleValue() throws Exception
+    {
         Optional<List<String>> nullValues = Optional.absent();
-        QueryConfig config = new QueryConfig("test", Optional.of("awesome"), nullValues, false);
-        List<QueryConfig.Query> dest = config.expand();
+        QueryOption config = new QueryOption("test", Optional.of("awesome"), nullValues, false);
+        List<QueryOption.Query> dest = config.expand();
         assertEquals(dest.size(), 1);
         assertEquals(dest.get(0).getName(), "test");
         assertEquals(dest.get(0).getValues().length, 1);
@@ -22,11 +23,12 @@ public class TestQueryConfig {
     }
 
     @Test
-    public void testUnexpandMultiValue() throws Exception {
+    public void testUnexpandMultiValue() throws Exception
+    {
         Optional<String> nullValue = Optional.absent();
         List<String> values = Lists.newArrayList("a", "b", "c");
-        QueryConfig config = new QueryConfig("test", nullValue, Optional.of(values), false);
-        List<QueryConfig.Query> dest = config.expand();
+        QueryOption config = new QueryOption("test", nullValue, Optional.of(values), false);
+        List<QueryOption.Query> dest = config.expand();
         assertEquals(dest.size(), 1);
         assertEquals(dest.get(0).getName(), "test");
 
@@ -37,21 +39,23 @@ public class TestQueryConfig {
     }
 
     @Test
-    public void testExpandSingleValue() throws Exception {
+    public void testExpandSingleValue() throws Exception
+    {
         Optional<List<String>> nullValues = Optional.absent();
-        QueryConfig config = new QueryConfig("test", Optional.of("awesome"), nullValues, true);
-        List<QueryConfig.Query> dest = config.expand();
+        QueryOption config = new QueryOption("test", Optional.of("awesome"), nullValues, true);
+        List<QueryOption.Query> dest = config.expand();
         assertEquals(dest.size(), 1);
         assertEquals(dest.get(0).getName(), "test");
         assertEquals(dest.get(0).getValues()[0], "awesome");
     }
 
     @Test
-    public void testExpandMultiValue() throws Exception {
+    public void testExpandMultiValue() throws Exception
+    {
         Optional<String> nullValue = Optional.absent();
         List<String> values = Lists.newArrayList("a", "b", "c");
-        QueryConfig config = new QueryConfig("test", nullValue, Optional.of(values), true);
-        List<QueryConfig.Query> dest = config.expand();
+        QueryOption config = new QueryOption("test", nullValue, Optional.of(values), true);
+        List<QueryOption.Query> dest = config.expand();
         assertEquals(dest.size(), 3);
         assertEquals(dest.get(0).getName(), "test");
         assertEquals(dest.get(0).getValues().length, 1);
@@ -67,18 +71,20 @@ public class TestQueryConfig {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void testExpandRaisesExceptionWhenBothValuesAreNull() throws Exception {
+    public void testExpandRaisesExceptionWhenBothValuesAreNull() throws Exception
+    {
         Optional<List<String>> nullValues = Optional.absent();
         Optional<String> nullValue = Optional.absent();
-        QueryConfig config = new QueryConfig("test", nullValue, nullValues, false);
+        QueryOption config = new QueryOption("test", nullValue, nullValues, false);
         config.expand();
     }
 
     @Test
-    public void testUnExpandBrace() throws Exception {
+    public void testUnExpandBrace() throws Exception
+    {
         Optional<List<String>> nullValues = Optional.absent();
-        QueryConfig config = new QueryConfig("test", Optional.of("{awesome1,awesome2,awesome3}"), nullValues, false);
-        List<QueryConfig.Query> dest = config.expand();
+        QueryOption config = new QueryOption("test", Optional.of("{awesome1,awesome2,awesome3}"), nullValues, false);
+        List<QueryOption.Query> dest = config.expand();
         assertEquals(dest.size(), 1);
         assertEquals(dest.get(0).getName(), "test");
         assertEquals(dest.get(0).getValues().length, 1);
@@ -86,10 +92,11 @@ public class TestQueryConfig {
     }
 
     @Test
-    public void testExpandBrace() throws Exception {
+    public void testExpandBrace() throws Exception
+    {
         Optional<List<String>> nullValues = Optional.absent();
-        QueryConfig config = new QueryConfig("test", Optional.of("{awesome1,awesome2,awesome3}"), nullValues, true);
-        List<QueryConfig.Query> dest = config.expand();
+        QueryOption config = new QueryOption("test", Optional.of("{awesome1,awesome2,awesome3}"), nullValues, true);
+        List<QueryOption.Query> dest = config.expand();
         assertEquals(dest.size(), 3);
         assertEquals(dest.get(0).getName(), "test");
         assertEquals(dest.get(0).getValues().length, 1);
@@ -105,10 +112,11 @@ public class TestQueryConfig {
     }
 
     @Test
-    public void testExpandEscapedBrace() throws Exception {
+    public void testExpandEscapedBrace() throws Exception
+    {
         Optional<List<String>> nullValues = Optional.absent();
-        QueryConfig config = new QueryConfig("test", Optional.of("{awe\\,some1,awes\\{ome2,awes\\}ome3}"), nullValues, true);
-        List<QueryConfig.Query> dest = config.expand();
+        QueryOption config = new QueryOption("test", Optional.of("{awe\\,some1,awes\\{ome2,awes\\}ome3}"), nullValues, true);
+        List<QueryOption.Query> dest = config.expand();
         assertEquals(dest.get(0).getName(), "test");
         assertEquals(dest.get(0).getValues().length, 1);
         assertEquals(dest.get(0).getValues()[0], "awe,some1");
@@ -121,5 +129,4 @@ public class TestQueryConfig {
         assertEquals(dest.get(2).getValues().length, 1);
         assertEquals(dest.get(2).getValues()[0], "awes}ome3");
     }
-
-}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-http
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - Takuma kanari
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +51,7 @@ files:
 - build.gradle
 - config/checkstyle/checkstyle.xml
 - config/checkstyle/default.xml
+- embulk-input-http.gemspec
 - example/json-example.yml
 - gradle/wrapper/gradle-wrapper.jar
 - gradle/wrapper/gradle-wrapper.properties
@@ -58,19 +59,20 @@ files:
 - gradlew.bat
 - lib/embulk/input/http.rb
 - settings.gradle
-- src/main/java/org/embulk/input/http/BasicAuthConfig.java
+- src/main/java/org/embulk/input/http/BasicAuthOption.java
 - src/main/java/org/embulk/input/http/HttpFileInputPlugin.java
-- src/main/java/org/embulk/input/http/PagerConfig.java
-- src/main/java/org/embulk/input/http/ParamsConfig.java
-- src/main/java/org/embulk/input/http/QueryConfig.java
+- src/main/java/org/embulk/input/http/PagerOption.java
+- src/main/java/org/embulk/input/http/ParamsOption.java
+- src/main/java/org/embulk/input/http/QueryOption.java
 - src/main/java/org/embulk/input/http/RetryableHandler.java
 - src/test/java/org/embulk/input/http/TestHttpInputPlugin.java
-- src/test/java/org/embulk/input/http/TestPagerConfig.java
-- src/test/java/org/embulk/input/http/TestParamsConfig.java
-- src/test/java/org/embulk/input/http/TestQueryConfig.java
+- src/test/java/org/embulk/input/http/TestPagerOption.java
+- src/test/java/org/embulk/input/http/TestParamsOption.java
+- src/test/java/org/embulk/input/http/TestQueryOption.java
 - classpath/commons-codec-1.9.jar
+- classpath/commons-io-2.5.jar
 - classpath/commons-logging-1.2.jar
-- classpath/embulk-input-http-0.0.15.jar
+- classpath/embulk-input-http-0.0.17.jar
 - classpath/httpclient-4.5.jar
 - classpath/httpcore-4.4.1.jar
 homepage: https://github.com/takumakanari/embulk-input-http