embulk-input-yelp 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b35f786752e36fc39d933b59e2b0319d56bd49b0
-  data.tar.gz: aa49ccf14ab02a25a15fad0a73f18a9d1e6ea0ef
+  metadata.gz: 783d1729496c8fcbff44ca42358f5692a30f7b29
+  data.tar.gz: 36caf4c514c2ada8ddb51829743330a9d6064632
 SHA512:
-  metadata.gz: ce515a1732f763144619d2b94b2362b021515a83d83fcf16bd9ea4b2f142cd919be6918d5336cdc2199d10828d13aa4679dd4cbfbc02af14bf21c36bd2c94c35
-  data.tar.gz: 83658e28d129ed5d0ccc78529212e707823a8b37d688365d01355d825f2fd1b8b86a5e3784f22994e0950bb3d66b3201e8134bde18dd19a2e9ffa702d4a14ccc
+  metadata.gz: 4e8b86b970ab51d00e4883b0d29fe5642d726e1566a64cb944990f7d3f3cb29de76a3002083324812cc36a17ed20441bc8928a21ad4474d9fdf6c7057ea3ad2d
+  data.tar.gz: 4f63f3a4ad043e27a5b0237c9d839ad8d5dc09dde4ee5bef4e0260b81eee4791b921db47dfffde87dd0435f459a2b611c27df733ca6ba713453c81b72ff4160f

data/build.gradle

@@ -17,7 +17,7 @@ configurations {
     provided
 }
 
-version = "0.2.1"
+version = "0.2.2"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/src/main/java/org/embulk/input/yelp/YelpInputPluginDelegate.java

@@ -1,7 +1,9 @@
 package org.embulk.input.yelp;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import javax.ws.rs.core.Response;
 import javax.ws.rs.client.WebTarget;
@@ -11,6 +13,7 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Ordering;
 
 import org.embulk.config.Config;
@@ -31,6 +34,7 @@ import org.embulk.base.restclient.ServiceDataSplitter;
 import org.embulk.base.restclient.jackson.JacksonJsonPointerValueLocator;
 import org.embulk.base.restclient.jackson.JacksonServiceRecord;
 import org.embulk.base.restclient.jackson.JacksonServiceResponseMapper;
+import org.embulk.base.restclient.jackson.JacksonTopLevelValueLocator;
 import org.embulk.base.restclient.jackson.StringJsonParser;
 import org.embulk.base.restclient.record.RecordImporter;
 
@@ -66,6 +70,10 @@ public class YelpInputPluginDelegate
         @ConfigDefault("null")
         public Optional<Integer> getRadius();
 
+        @Config("columns")
+        @ConfigDefault("{}")
+        public Map<String, String> getColumns();
+
         @Config("maximum_retries")
         @ConfigDefault("7")
         public int getMaximumRetries();
@@ -99,21 +107,38 @@ public class YelpInputPluginDelegate
     @Override  // Overridden from |ServiceResponseMapperBuildable|
     public JacksonServiceResponseMapper buildServiceResponseMapper(PluginTask task)
     {
+        HashMap<String, String> columnMap = new HashMap<String, String>();
+        for (String defaultColumn : DEFAULT_COLUMNS) {
+            if (task.getColumns().containsKey(defaultColumn)) {
+                columnMap.put(defaultColumn, task.getColumns().get(defaultColumn));
+            }
+            else {
+                columnMap.put(defaultColumn, defaultColumn);
+            }
+        }
         return JacksonServiceResponseMapper.builder()
-            .add("rating", Types.LONG)
-            .add("price", Types.STRING)
-            .add("phone", Types.STRING)
-            .add("id", Types.STRING)
-            .add("is_closed", Types.BOOLEAN)
-            .add("categories", Types.JSON)
-            .add("review_count", Types.LONG)
-            .add("name", Types.STRING)
-            .add("url", Types.STRING)
-            .add(new JacksonJsonPointerValueLocator("/coordinates/latitude"), "latitude", Types.STRING)
-            .add(new JacksonJsonPointerValueLocator("/coordinates/longitude"), "longitude", Types.STRING)
-            .add("image_url", Types.STRING)
-            .add(new JacksonJsonPointerValueLocator("/location/city"), "location_city", Types.STRING)
-            .add(new JacksonJsonPointerValueLocator("/location/country"), "location_country", Types.STRING)
+            .add(new JacksonTopLevelValueLocator("rating"), columnMap.get("rating"), Types.LONG)
+            .add(new JacksonTopLevelValueLocator("price"), columnMap.get("price"), Types.STRING)
+            .add(new JacksonTopLevelValueLocator("phone"), columnMap.get("phone"), Types.STRING)
+            .add(new JacksonTopLevelValueLocator("id"), columnMap.get("id"), Types.STRING)
+            .add(new JacksonTopLevelValueLocator("is_closed"), columnMap.get("is_closed"), Types.BOOLEAN)
+            .add(new JacksonTopLevelValueLocator("categories"), columnMap.get("categories"), Types.JSON)
+            .add(new JacksonTopLevelValueLocator("review_count"), columnMap.get("review_count"), Types.LONG)
+            .add(new JacksonTopLevelValueLocator("name"), columnMap.get("name"), Types.STRING)
+            .add(new JacksonTopLevelValueLocator("url"), columnMap.get("url"), Types.STRING)
+            .add(new JacksonJsonPointerValueLocator("/coordinates/latitude"),
+                 columnMap.get("latitude"),
+                 Types.STRING)
+            .add(new JacksonJsonPointerValueLocator("/coordinates/longitude"),
+                 columnMap.get("longitude"),
+                 Types.STRING)
+            .add(new JacksonTopLevelValueLocator("image_url"), columnMap.get("image_url"), Types.STRING)
+            .add(new JacksonJsonPointerValueLocator("/location/city"),
+                 columnMap.get("location_city"),
+                 Types.STRING)
+            .add(new JacksonJsonPointerValueLocator("/location/country"),
+                 columnMap.get("location_country"),
+                 Types.STRING)
             .build();
     }
 
@@ -245,5 +270,22 @@ public class YelpInputPluginDelegate
             });
     }
 
+    private static final String[] DEFAULT_COLUMNS = {
+        "rating",
+        "price",
+        "phone",
+        "id",
+        "is_closed",
+        "categories",
+        "review_count",
+        "name",
+        "url",
+        "latitude",
+        "longitude",
+        "image_url",
+        "location_city",
+        "location_country"
+    };
+
     private final Logger logger = Exec.getLogger(YelpInputPluginDelegate.class);
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-yelp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Dai MIKURUBE
@@ -61,7 +61,7 @@ files:
 - src/test/java/org/embulk/input/yelp/TestYelpInputPlugin.java
 - classpath/aopalliance-repackaged-2.5.0-b32.jar
 - classpath/embulk-base-restclient-0.5.0.jar
-- classpath/embulk-input-yelp-0.2.1.jar
+- classpath/embulk-input-yelp-0.2.2.jar
 - classpath/embulk-util-retryhelper-jaxrs-0.5.0.jar
 - classpath/hk2-api-2.5.0-b32.jar
 - classpath/hk2-locator-2.5.0-b32.jar