| commit | 69ab91aae0e73e3cc9c4cd387a12529898860eef | [log] [tgz] |
|---|---|---|
| author | Till Westmann <tillw@apache.org> | Fri Jan 06 16:56:07 2017 -0800 |
| committer | Till Westmann <tillw@apache.org> | Fri Jan 06 18:16:46 2017 -0800 |
| tree | a7bfde1c5a5ba129159cc32254ceb6dae4baf044 | |
| parent | c49405aaf0530f651b262c674acd11b1c7cc133d [diff] |
2 small fixes for the transition to jackson - fix support for atomic results - remove one version in a POM Change-Id: I39279a6a9bf8bffcf4c426b47610479030a53b42 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1423 Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Reviewed-by: Chris Hillery <ceej@lambda.nu>
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java index 5465fbd..9b1a3db 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java
@@ -139,7 +139,7 @@ if (indentJSON) { // TODO(tillw): this is inefficient - do this during record generation try { - record = om.writerWithDefaultPrettyPrinter().writeValueAsString(om.readValue(result, ObjectNode.class)); + record = om.writerWithDefaultPrettyPrinter().writeValueAsString(om.readValue(result, Object.class)); } catch (IOException e) { throw new HyracksDataException(e); }
diff --git a/hyracks-fullstack/hyracks/hyracks-api/pom.xml b/hyracks-fullstack/hyracks/hyracks-api/pom.xml index c872bea..2c00862 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-api/pom.xml
@@ -93,7 +93,6 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.8.1</version> </dependency> </dependencies> </project>