embulk-filter-flatten_json 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf0081e351fe454511db57422dd700ac5a33d87d
-  data.tar.gz: 0e96abc3127d6c7927d9eb063ad5d9f7da30b452
+  metadata.gz: fff02143a8f84948f96f4a5bf58c08fb1e8724eb
+  data.tar.gz: e87c4459e8b2870d6deaf437152040edeac9d380
 SHA512:
-  metadata.gz: 07e761cc4d4d3a5123717fe5843389fdc51ec0aae4ff55ac40ec00c9430bc854a85ea4c096385e5d2616131e839cc47dfca72ad41b2c67c87ded3bfd1e6c33ca
-  data.tar.gz: 7a7c2220afba502bb28ad4d7c4575bc29fec509e9a0afe7b67ca32ce69bdd1e3aca1cc2b0bd0342cde55d50dee866d6037f95d28dd7246029eb44082f8b46d59
+  metadata.gz: 1d154754118d8b84c9cfc301da4d9e126166f95c34af41b2bd2db64b6497bcc7abe7a034c1f8c36830b5b6c9942601970d28a17b981c67bfc8a9acb09294dceb
+  data.tar.gz: 51d27e7ea6f610de758b0342b41f6582f078b8cf42883c99b12d28c661bcd1d9df3a7b977200033f92489b9eac507d5ee471ce65d007887b5ed69b4f0bb30a45

data/README.md

@@ -30,7 +30,8 @@ c1|c2|c3|json_payload
 
 - **json_columns**: column name list to flatten json (string, required)
 - **separator**: separator to join keys (string, default: `"."`)
-- **array_index_prefix**: prefix of array index when joining keys (string, default: `"_"`)
+- **array_index_prefix**: prefix of array index when joining keys (string, default: `null`)
+  - if set `null` and **separator** option use the default value, the output become like [JSONPath](http://goessner.net/articles/JsonPath/)
 
 ## Example
 

data/build.gradle

@@ -12,7 +12,7 @@ configurations {
     provided
 }
 
-version = "0.0.1"
+version = "0.0.2"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 

data/src/main/java/org/embulk/filter/flatten_json/FlattenJsonFilterPlugin.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ValueNode;
+import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Maps;
 import org.embulk.config.Config;
@@ -49,8 +50,8 @@ public class FlattenJsonFilterPlugin
         public String getSeparator();
 
         @Config("array_index_prefix")
-        @ConfigDefault("\"_\"")
-        public String getArrayIndexPrefix();
+        @ConfigDefault("null")
+        public Optional<String> getArrayIndexPrefix();
     }
 
     @Override
@@ -142,7 +143,7 @@ public class FlattenJsonFilterPlugin
                 }
             }
 
-            private void setFlattenJsonColumns(PageBuilder pageBuilder, List<Column> flattenJsonColumns, String separator, String arrayIndexPrefix)
+            private void setFlattenJsonColumns(PageBuilder pageBuilder, List<Column> flattenJsonColumns, String separator, Optional<String> arrayIndexPrefix)
                     throws IOException
             {
                 for (Column flattenJsonColumn: flattenJsonColumns) {
@@ -164,7 +165,7 @@ public class FlattenJsonFilterPlugin
                 }
             }
 
-            private void joinNode(String currentPath, JsonNode jsonNode, Map<String, String> map, String separator, String arrayIndexPrefix) {
+            private void joinNode(String currentPath, JsonNode jsonNode, Map<String, String> map, String separator, Optional<String> arrayIndexPrefix) {
                 if (jsonNode.isObject()) {
                     ObjectNode objectNode = (ObjectNode) jsonNode;
                     Iterator<Map.Entry<String, JsonNode>> iterator = objectNode.fields();
@@ -176,8 +177,15 @@ public class FlattenJsonFilterPlugin
                     }
                 } else if (jsonNode.isArray()) {
                     ArrayNode arrayNode = (ArrayNode) jsonNode;
-                    for (int i = 0; i < arrayNode.size(); i++) {
-                        joinNode(currentPath + separator + arrayIndexPrefix + i, arrayNode.get(i), map, separator, arrayIndexPrefix);
+                    if (arrayIndexPrefix.isPresent()) {
+                        for (int i = 0; i < arrayNode.size(); i++) {
+                            joinNode(currentPath + separator + arrayIndexPrefix.get() + i, arrayNode.get(i), map, separator, arrayIndexPrefix);
+                        }
+                    }
+                    else {
+                        for (int i = 0; i < arrayNode.size(); i++) {
+                            joinNode(currentPath + "[" + i + "]", arrayNode.get(i), map, separator, arrayIndexPrefix);
+                        }
                     }
                 } else if (jsonNode.isValueNode()) {
                     ValueNode valueNode = (ValueNode) jsonNode;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-flatten_json
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Civitaspo
@@ -58,7 +58,7 @@ files:
 - lib/embulk/filter/flatten_json.rb
 - src/main/java/org/embulk/filter/flatten_json/FlattenJsonFilterPlugin.java
 - src/test/java/org/embulk/filter/flatten_json/TestFlattenJsonFilterPlugin.java
-- classpath/embulk-filter-flatten_json-0.0.1.jar
+- classpath/embulk-filter-flatten_json-0.0.2.jar
 homepage: https://github.com/civitaspo/embulk-filter-flatten_json
 licenses:
 - MIT