Repository: incubator-gobblin Updated Branches: refs/heads/master 15b7cd08f -> 1cbd157fa
[GOBBLIN-479] json to avro converter fix Closes #2350 from arjun4084346/jsonToAvroFixed Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/1cbd157f Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/1cbd157f Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/1cbd157f Branch: refs/heads/master Commit: 1cbd157fadbe394dbfa95a45f719670cff62c9ab Parents: 15b7cd0 Author: Arjun <[email protected]> Authored: Wed May 2 07:51:35 2018 -0700 Committer: Abhishek Tiwari <[email protected]> Committed: Wed May 2 07:51:35 2018 -0700 ---------------------------------------------------------------------- .../apache/gobblin/source/DatePartitionedJsonFileSource.java | 4 ++-- .../apache/gobblin/source/extractor/SimpleJsonExtractor.java | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/1cbd157f/gobblin-core/src/main/java/org/apache/gobblin/source/DatePartitionedJsonFileSource.java ---------------------------------------------------------------------- diff --git a/gobblin-core/src/main/java/org/apache/gobblin/source/DatePartitionedJsonFileSource.java b/gobblin-core/src/main/java/org/apache/gobblin/source/DatePartitionedJsonFileSource.java index cc5167a..c13a6db 100644 --- a/gobblin-core/src/main/java/org/apache/gobblin/source/DatePartitionedJsonFileSource.java +++ b/gobblin-core/src/main/java/org/apache/gobblin/source/DatePartitionedJsonFileSource.java @@ -25,14 +25,14 @@ import org.apache.gobblin.source.extractor.Extractor; import com.google.gson.JsonObject; -public class DatePartitionedJsonFileSource extends PartitionedFileSourceBase<String, JsonObject> { +public class DatePartitionedJsonFileSource extends PartitionedFileSourceBase<String, String> { public DatePartitionedJsonFileSource() { super(new DatePartitionedNestedRetriever(".json")); } @Override - public Extractor<String, JsonObject> getExtractor(WorkUnitState state) + public Extractor<String, String> getExtractor(WorkUnitState state) throws IOException { return new DatePartitionedJsonFileExtractor(state); } http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/1cbd157f/gobblin-core/src/main/java/org/apache/gobblin/source/extractor/SimpleJsonExtractor.java ---------------------------------------------------------------------- diff --git a/gobblin-core/src/main/java/org/apache/gobblin/source/extractor/SimpleJsonExtractor.java b/gobblin-core/src/main/java/org/apache/gobblin/source/extractor/SimpleJsonExtractor.java index 412a06e..020c001 100644 --- a/gobblin-core/src/main/java/org/apache/gobblin/source/extractor/SimpleJsonExtractor.java +++ b/gobblin-core/src/main/java/org/apache/gobblin/source/extractor/SimpleJsonExtractor.java @@ -45,7 +45,7 @@ import org.apache.gobblin.configuration.WorkUnitState; * json documents confirming to a schema. Each line of the file is a json document. * </p> */ -public class SimpleJsonExtractor implements Extractor<String, JsonObject> { +public class SimpleJsonExtractor implements Extractor<String, String> { private static final Logger LOGGER = LoggerFactory.getLogger(SimpleJsonExtractor.class); private final WorkUnitState workUnitState; @@ -84,9 +84,8 @@ public class SimpleJsonExtractor implements Extractor<String, JsonObject> { } @Override - public JsonObject readRecord(@Deprecated JsonObject reuse) throws DataRecordException, IOException { - String jsonString = this.bufferedReader.readLine(); - return GSON.fromJson(jsonString, JsonObject.class); + public String readRecord(@Deprecated String reuse) throws DataRecordException, IOException { + return this.bufferedReader.readLine(); } @Override
