embulk-filter-json_key 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10ca802406bca013bdbab6acb7e5905398f6c6a9
-  data.tar.gz: 0e3539b540784dac7bea4a6d4c955e913910f4ba
+  metadata.gz: edac8b3c9d2d31c8c173cec8ea9580263e36f621
+  data.tar.gz: 60ed7bf6d0cc124e0aa91abed0d68615b5403f23
 SHA512:
-  metadata.gz: 3edb3f9854921e03142c802bad6e4b68b55449aef42d41f6fade97b2e39c637dcf955adade9e8aa623797849e44f1ca85065335eb69445fe2a19f30b35b050c1
-  data.tar.gz: 79a62c4ffef8cd77a64f5cf41ae4bdc3caa5e408508e5cac8b501cc6c726f50b0be7543667cfdbfea5e07603b4d6b194240e75a873000f69244571903b32804b
+  metadata.gz: f5ed0b5a8feaa5d160a79ecc2ca6bd8303ec86be3a80e549796671639314ef92e01f4a322c3d3ccbaf95371f07c4846a51bf7b44a6e6a2b0d8062d904cdd2fd3
+  data.tar.gz: e46e499ca06813f85c2bd8330f3838c314059b02c988295b5f2055483f438f21a853e85f42263a399d4d60410c6a716ffddf5210399fb9b026c81abf0659f926

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/json_key/JsonKeyFilter.java

@@ -102,6 +102,10 @@ class JsonKeyFilter
         // TODO: addKey is overwriting existing values.
         private JsonNode addKey(JsonNode node, List<String> nestedKey, JsonNode value)
         {
+            if (node == null) {
+                return null;
+            }
+
             if (node.isObject()) {
                 return addKeyToObject(node, nestedKey, value);
             }
@@ -131,7 +135,9 @@ class JsonKeyFilter
                 String parentKey = nestedKey.get(0);
                 List<String> newNestedKey = nestedKey.subList(1, nestedKey.size());
                 JsonNode newNode = addKey(object.get(parentKey), newNestedKey, value);
-                object.set(parentKey, newNode);
+                if (newNode != null) {
+                    object.set(parentKey, newNode);
+                }
                 return object;
             }
         }
@@ -156,7 +162,9 @@ class JsonKeyFilter
                 if (NumberUtils.isNumber(parentIdx)) {
                     int idx = Integer.parseInt(parentIdx);
                     JsonNode newNode = addKey(object.get(idx), newNestedKey, value);
-                    object.set(idx, newNode);
+                    if (newNode != null) {
+                        object.set(idx, newNode);
+                    }
                 }
                 return object;
             }
@@ -184,6 +192,10 @@ class JsonKeyFilter
         // if NullNode has come before end of a nested key, return NullNode not EmptyObjectNode.
         private JsonNode dropKey(JsonNode node, List<String> nestedKey)
         {
+            if (node == null) {
+                return null;
+            }
+
             if (node.isObject()) {
                 return dropKeyFromObject(node, nestedKey);
             }
@@ -209,7 +221,9 @@ class JsonKeyFilter
                 String parentKey = nestedKey.get(0);
                 List<String> newNestedKey = nestedKey.subList(1, nestedKey.size());
                 JsonNode newNode = dropKey(object.get(parentKey), newNestedKey);
-                object.set(parentKey, newNode);
+                if (newNode != null) {
+                    object.set(parentKey, newNode);
+                }
                 return object;
             }
         }
@@ -233,7 +247,9 @@ class JsonKeyFilter
                 if (NumberUtils.isNumber(parentIdx)) {
                     int idx = Integer.parseInt(parentIdx);
                     JsonNode newNode = dropKey(object.get(idx), newNestedKey);
-                    object.set(idx, newNode);
+                    if (newNode != null) {
+                        object.set(idx, newNode);
+                    }
                 }
                 return object;
             }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-json_key
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Civitaspo
@@ -64,7 +64,7 @@ files:
 - src/test/java/org/embulk/filter/json_key/TestAddKeyFilter.java
 - src/test/java/org/embulk/filter/json_key/TestDropKeyFilter.java
 - src/test/java/org/embulk/filter/json_key/TestJsonKeyFilterPlugin.java
-- classpath/embulk-filter-json_key-0.0.1.jar
+- classpath/embulk-filter-json_key-0.0.2.jar
 homepage: https://github.com/civitaspo/embulk-filter-json_key
 licenses:
 - MIT