Преглед на файлове

ZOOKEEPER-3051: Updated jackson to the latest version

Change-Id: Iec76a7df76f8e1928828fd716c4c25f48e887ba1

Author: Patrick Hunt <phunt@apache.org>

Reviewers: Michael Han <hanm@apache.org>

Closes #527 from phunt/ZOOKEEPER-3051
Patrick Hunt преди 7 години
родител
ревизия
24f093b9c1
променени са 3 файла, в които са добавени 14 реда и са изтрити 15 реда
  1. 1 1
      build.xml
  2. 2 2
      ivy.xml
  3. 11 12
      src/java/main/org/apache/zookeeper/server/admin/JsonOutputter.java

+ 1 - 1
build.xml

@@ -52,7 +52,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <property name="javacc.version" value="5.0"/>
     <property name="javacc.version" value="5.0"/>
 
 
     <property name="jetty.version" value="9.4.10.v20180503"/>
     <property name="jetty.version" value="9.4.10.v20180503"/>
-    <property name="jackson-mapper-asl.version" value="1.9.11"/>
+    <property name="jackson.version" value="2.9.5"/>
     <property name="dependency-check-ant.version" value="2.1.0"/>
     <property name="dependency-check-ant.version" value="2.1.0"/>
 
 
     <property name="commons-io.version" value="2.4"/>
     <property name="commons-io.version" value="2.4"/>

+ 2 - 2
ivy.xml

@@ -131,8 +131,8 @@
                 conf="optional->default"/>
                 conf="optional->default"/>
       <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="${jetty.version}"
       <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="${jetty.version}"
                   conf="optional->default"/>
                   conf="optional->default"/>
-    <dependency org="org.codehaus.jackson" name="jackson-mapper-asl"
-                rev="${jackson-mapper-asl.version}" conf="optional->default"/>
+    <dependency org="com.fasterxml.jackson.core" name="jackson-databind"
+                rev="${jackson.version}" conf="optional->default"/>
 
 
     <dependency org="org.openclover" name="clover" rev="${clover.version}" conf="clover->default"/>
     <dependency org="org.openclover" name="clover" rev="${clover.version}" conf="clover->default"/>
 
 

+ 11 - 12
src/java/main/org/apache/zookeeper/server/admin/JsonOutputter.java

@@ -18,18 +18,17 @@
 
 
 package org.apache.zookeeper.server.admin;
 package org.apache.zookeeper.server.admin;
 
 
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Map;
-
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.PropertyNamingStrategy;
-import org.codehaus.jackson.map.SerializationConfig;
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
+import java.io.IOException;
+import java.io.PrintWriter;
+
 public class JsonOutputter implements CommandOutputter {
 public class JsonOutputter implements CommandOutputter {
     static final Logger LOG = LoggerFactory.getLogger(JsonOutputter.class);
     static final Logger LOG = LoggerFactory.getLogger(JsonOutputter.class);
 
 
@@ -39,9 +38,9 @@ public class JsonOutputter implements CommandOutputter {
 
 
     public JsonOutputter() {
     public JsonOutputter() {
         mapper = new ObjectMapper();
         mapper = new ObjectMapper();
-        mapper.configure(SerializationConfig.Feature.WRITE_ENUMS_USING_TO_STRING, true);
-        mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
-        mapper.setPropertyNamingStrategy(PropertyNamingStrategy.CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES);
+        mapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
+        mapper.configure(SerializationFeature.INDENT_OUTPUT, true);
+        mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
     }
     }
 
 
     @Override
     @Override