embulk-input-yelp 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 783d1729496c8fcbff44ca42358f5692a30f7b29
-  data.tar.gz: 36caf4c514c2ada8ddb51829743330a9d6064632
+  metadata.gz: da55630ab13c030342e8881b74c8458571491a5e
+  data.tar.gz: cf839bf3fd2e2b9d7bfaffaba165db64361f9cb2
 SHA512:
-  metadata.gz: 4e8b86b970ab51d00e4883b0d29fe5642d726e1566a64cb944990f7d3f3cb29de76a3002083324812cc36a17ed20441bc8928a21ad4474d9fdf6c7057ea3ad2d
-  data.tar.gz: 4f63f3a4ad043e27a5b0237c9d839ad8d5dc09dde4ee5bef4e0260b81eee4791b921db47dfffde87dd0435f459a2b611c27df733ca6ba713453c81b72ff4160f
+  metadata.gz: 0b083c91738b745bebe2fb4fca27fead52f05910c8fb74b751656136f0d79ef594643ce9afa8c6ba76173b63b0bf08800e3bf819ed761ea4530bf01c276a16aa
+  data.tar.gz: debcf29a45b83ae256c9b7048223476fe62ae215d23c51640597e1432fd6d1a8bf11027236c7be42738c27376c9100a7ded27f1514db9e0bc765eb21238a8342

data/build.gradle

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

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

@@ -1,6 +1,5 @@
 package org.embulk.input.yelp;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -10,6 +9,7 @@ import javax.ws.rs.client.WebTarget;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import com.google.common.base.Optional;
@@ -25,6 +25,7 @@ import org.embulk.spi.DataException;
 import org.embulk.spi.Exec;
 import org.embulk.spi.PageBuilder;
 import org.embulk.spi.Schema;
+import org.embulk.spi.type.Type;
 import org.embulk.spi.type.Types;
 
 import org.embulk.base.restclient.DefaultServiceDataSplitter;
@@ -35,6 +36,7 @@ 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.JacksonValueLocator;
 import org.embulk.base.restclient.jackson.StringJsonParser;
 import org.embulk.base.restclient.record.RecordImporter;
 
@@ -107,39 +109,27 @@ 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(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();
+        JacksonServiceResponseMapper.Builder builder = JacksonServiceResponseMapper.builder();
+        addColumn(builder, new JacksonYelpCategoriesValueLocator(), "categories",
+                  Types.JSON, task.getColumns());
+        addColumn(builder, new JacksonJsonPointerValueLocator("/coordinates/latitude"), "latitude",
+                  Types.STRING, task.getColumns());
+        addColumn(builder, new JacksonJsonPointerValueLocator("/coordinates/longitude"), "longitude",
+                  Types.STRING, task.getColumns());
+        addColumn(builder, "id", Types.STRING, task.getColumns());
+        addColumn(builder, "image_url", Types.STRING, task.getColumns());
+        addColumn(builder, "is_closed", Types.BOOLEAN, task.getColumns());
+        addColumn(builder, new JacksonJsonPointerValueLocator("/location/city"), "city",
+                  Types.STRING, task.getColumns());
+        addColumn(builder, new JacksonJsonPointerValueLocator("/location/country"), "country",
+                  Types.STRING, task.getColumns());
+        addColumn(builder, "name", Types.STRING, task.getColumns());
+        addColumn(builder, "phone", Types.STRING, task.getColumns());
+        addColumn(builder, "price", Types.STRING, task.getColumns());
+        addColumn(builder, "rating", Types.STRING, task.getColumns());
+        addColumn(builder, "review_count", Types.LONG, task.getColumns());
+        addColumn(builder, "url", Types.STRING, task.getColumns());
+        return builder.build();
     }
 
     @Override  // Overridden from |ConfigDiffBuildable|
@@ -208,6 +198,56 @@ public class YelpInputPluginDelegate
         return report;
     }
 
+    private static class JacksonYelpCategoriesValueLocator
+            extends JacksonValueLocator
+    {
+        public JacksonYelpCategoriesValueLocator(String name)
+        {
+            this.name = name;
+        }
+
+        public JacksonYelpCategoriesValueLocator()
+        {
+            this("categories");
+        }
+
+        @Override
+        public JsonNode seekValue(ObjectNode record)
+        {
+            JsonNode categoriesNode = record.get(this.name);
+            if (categoriesNode == null || categoriesNode.isNull()) {
+                return JsonNodeFactory.instance.arrayNode();
+            }
+            if (!categoriesNode.isArray()) {
+                throw new RuntimeException("categories must be an array");
+            }
+            ArrayNode categoriesArray = (ArrayNode) categoriesNode;
+
+            ArrayNode categoryAliases = JsonNodeFactory.instance.arrayNode();
+            for (JsonNode categoryNode : categoriesArray) {
+                if (!categoryNode.isObject()) {
+                    throw new RuntimeException("a category must be an object");
+                }
+                ObjectNode categoryObject = (ObjectNode) categoryNode;
+                JsonNode aliasNode = categoryObject.get("alias");
+                if (aliasNode == null || !aliasNode.isTextual()) {
+                    throw new RuntimeException("a category alias must be textual");
+                }
+                categoryAliases.add(aliasNode.asText());
+            }
+
+            return categoryAliases;
+        }
+
+        @Override
+        public void placeValue(ObjectNode record, JsonNode value)
+        {
+            throw new RuntimeException("Not implemented.");
+        }
+
+        private final String name;
+    }
+
     private ArrayNode extractArrayField(String content)
     {
         ObjectNode object = jsonParser.parseJsonObject(content);
@@ -270,22 +310,30 @@ 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 void addColumn(JacksonServiceResponseMapper.Builder builder,
+                           JacksonValueLocator locator,
+                           String name,
+                           Type type,
+                           Map<String, String> alternatives)
+    {
+        if (alternatives.containsKey(name)) {
+            String alternativeName = alternatives.get(name);
+            if (alternativeName != null && !alternativeName.isEmpty()) {
+                builder.add(locator, alternativeName, type);
+            }
+        }
+        else {
+            builder.add(locator, name, type);
+        }
+    }
+
+    private void addColumn(JacksonServiceResponseMapper.Builder builder,
+                           String name,
+                           Type type,
+                           Map<String, String> alternatives)
+    {
+        addColumn(builder, new JacksonTopLevelValueLocator(name), name, type, alternatives);
+    }
 
     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.2
+  version: 0.2.3
 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.2.jar
+- classpath/embulk-input-yelp-0.2.3.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