diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml index 5f343320378..e8563156919 100644 --- a/ambari-project/pom.xml +++ b/ambari-project/pom.xml @@ -42,8 +42,8 @@ 5.1.0 5.3.22 5.7.8 - 2.13.5 - 2.13.5 + 2.18.2 + 2.18.2 42.3.8 1.17.6 4 @@ -450,31 +450,6 @@ jersey-grizzly ${jersey.version} - - org.codehaus.jackson - jackson-core-asl - 1.9.9 - - - org.codehaus.jackson - jackson-jaxrs - 1.9.9 - - - org.codehaus.jackson - jackson-xc - 1.9.9 - - - org.codehaus.jackson - jackson-mappper - 1.9.9 - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 - com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider diff --git a/ambari-server-spi/pom.xml b/ambari-server-spi/pom.xml index fb8cd111c6c..a31dce216ac 100644 --- a/ambari-server-spi/pom.xml +++ b/ambari-server-spi/pom.xml @@ -153,8 +153,9 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core + ${fasterxml.jackson.version} diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 222f0e7f195..de8aca2e66e 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -1442,16 +1442,19 @@ ${jersey.version} - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind + ${fasterxml.jackson.databind.version} - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core + ${fasterxml.jackson.version} - org.codehaus.jackson - jackson-jaxrs + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${fasterxml.jackson.version} io.swagger @@ -1490,10 +1493,10 @@ io.swagger swagger-models - + org.springframework spring-aop @@ -1697,7 +1700,8 @@ com.fasterxml.jackson.core - jackson-databind + jackson-core + ${fasterxml.jackson.databind.version} javax.xml.bind diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandReport.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandReport.java index f771b54aff9..b46edf8fcbb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandReport.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandReport.java @@ -17,7 +17,7 @@ */ package org.apache.ambari.server.agent; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class CommandReport { @@ -35,144 +35,122 @@ public class CommandReport { private String customCommand; @JsonProperty("customCommand") - @com.fasterxml.jackson.annotation.JsonProperty("customCommand") public String getCustomCommand() { return customCommand; } @JsonProperty("customCommand") - @com.fasterxml.jackson.annotation.JsonProperty("customCommand") public void setCustomCommand(String customCommand) { this.customCommand = customCommand; } @JsonProperty("taskId") - @com.fasterxml.jackson.annotation.JsonProperty("taskId") public long getTaskId() { return taskId; } @JsonProperty("taskId") - @com.fasterxml.jackson.annotation.JsonProperty("taskId") public void setTaskId(long taskId) { this.taskId = taskId; } @JsonProperty("actionId") - @com.fasterxml.jackson.annotation.JsonProperty("actionId") public String getActionId() { return this.actionId; } @JsonProperty("actionId") - @com.fasterxml.jackson.annotation.JsonProperty("actionId") public void setActionId(String actionId) { this.actionId = actionId; } @JsonProperty("stderr") - @com.fasterxml.jackson.annotation.JsonProperty("stderr") public String getStdErr() { return this.stderr; } @JsonProperty("stderr") - @com.fasterxml.jackson.annotation.JsonProperty("stderr") public void setStdErr(String stderr) { this.stderr = stderr; } @JsonProperty("exitcode") - @com.fasterxml.jackson.annotation.JsonProperty("exitcode") public int getExitCode() { return this.exitCode; } @JsonProperty("exitcode") - @com.fasterxml.jackson.annotation.JsonProperty("exitcode") public void setExitCode(int exitCode) { this.exitCode = exitCode; } @JsonProperty("stdout") - @com.fasterxml.jackson.annotation.JsonProperty("stdout") public String getStdOut() { return this.stdout; } @JsonProperty("stdout") - @com.fasterxml.jackson.annotation.JsonProperty("stdout") public void setStdOut(String stdout) { this.stdout = stdout; } @JsonProperty("structuredOut") - @com.fasterxml.jackson.annotation.JsonProperty("structuredOut") public String getStructuredOut() { return this.structuredOut; } @JsonProperty("structuredOut") - @com.fasterxml.jackson.annotation.JsonProperty("structuredOut") public void setStructuredOut(String structuredOut) { this.structuredOut = structuredOut; } @JsonProperty("roleCommand") - @com.fasterxml.jackson.annotation.JsonProperty("roleCommand") public String getRoleCommand() { return this.roleCommand; } @JsonProperty("roleCommand") - @com.fasterxml.jackson.annotation.JsonProperty("roleCommand") public void setRoleCommand(String roleCommand) { this.roleCommand = roleCommand; } @JsonProperty("role") - @com.fasterxml.jackson.annotation.JsonProperty("role") public String getRole() { return role; } @JsonProperty("role") - @com.fasterxml.jackson.annotation.JsonProperty("role") public void setRole(String role) { this.role = role; } @JsonProperty("status") - @com.fasterxml.jackson.annotation.JsonProperty("status") public String getStatus() { return status; } @JsonProperty("status") - @com.fasterxml.jackson.annotation.JsonProperty("status") public void setStatus(String status) { this.status = status; } @JsonProperty("serviceName") - @com.fasterxml.jackson.annotation.JsonProperty("serviceName") public String getServiceName() { return serviceName; } @JsonProperty("serviceName") - @com.fasterxml.jackson.annotation.JsonProperty("serviceName") public void setServiceName(String serviceName) { this.serviceName = serviceName; } - @com.fasterxml.jackson.annotation.JsonProperty("clusterId") + @JsonProperty("clusterId") public String getClusterId() { return clusterId; } - @com.fasterxml.jackson.annotation.JsonProperty("clusterId") + @JsonProperty("clusterId") public void setClusterId(String clusterId) { this.clusterId = clusterId; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentRecoveryReport.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentRecoveryReport.java index 033043fd2f9..b98a9ceee26 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentRecoveryReport.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentRecoveryReport.java @@ -17,7 +17,7 @@ */ package org.apache.ambari.server.agent; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class ComponentRecoveryReport { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentsResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentsResponse.java index 3581692e875..c4b5b4036e3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentsResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentsResponse.java @@ -20,7 +20,7 @@ import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class ComponentsResponse { @JsonProperty("clusterName") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/DiskInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/DiskInfo.java index efa46d834de..f02759fa12d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/DiskInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/DiskInfo.java @@ -18,7 +18,7 @@ package org.apache.ambari.server.agent; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** @@ -59,85 +59,71 @@ public DiskInfo(String device, String mountpoint, String available, public DiskInfo() {} @JsonProperty("available") - @com.fasterxml.jackson.annotation.JsonProperty("available") public void setAvailable(String available) { this.available = available; } @JsonProperty("available") - @com.fasterxml.jackson.annotation.JsonProperty("available") public String getAvailable() { return this.available; } @JsonProperty("mountpoint") - @com.fasterxml.jackson.annotation.JsonProperty("mountpoint") public String getMountPoint() { return this.mountpoint; } @JsonProperty("mountpoint") - @com.fasterxml.jackson.annotation.JsonProperty("mountpoint") public void setMountPoint(String mountpoint) { this.mountpoint = mountpoint; } @JsonProperty("type") - @com.fasterxml.jackson.annotation.JsonProperty("type") public String getType() { return this.type; } @JsonProperty("type") - @com.fasterxml.jackson.annotation.JsonProperty("type") public void setType(String type) { this.type = type; } @JsonProperty("used") - @com.fasterxml.jackson.annotation.JsonProperty("used") public String getUsed() { return this.used; } @JsonProperty("used") - @com.fasterxml.jackson.annotation.JsonProperty("used") public void setUsed(String used) { this.used = used; } @JsonProperty("percent") - @com.fasterxml.jackson.annotation.JsonProperty("percent") public String getPercent() { return this.percent; } @JsonProperty("percent") - @com.fasterxml.jackson.annotation.JsonProperty("percent") public void setPercent(String percent) { this.percent = percent; } @JsonProperty("size") - @com.fasterxml.jackson.annotation.JsonProperty("size") public String getSize() { return this.size; } @JsonProperty("size") - @com.fasterxml.jackson.annotation.JsonProperty("size") public void setSize(String size) { this.size = size; } @JsonProperty("device") - @com.fasterxml.jackson.annotation.JsonProperty("device") public String getDevice() { return device; } @JsonProperty("device") - @com.fasterxml.jackson.annotation.JsonProperty("device") public void setDevice(String device) { this.device = device; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java index 4150d29bf30..2f990b27ca8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java @@ -22,7 +22,8 @@ import java.util.List; import org.apache.ambari.server.state.Alert; -import org.codehaus.jackson.annotate.JsonProperty; + +import com.fasterxml.jackson.annotation.JsonProperty; /** * @@ -33,10 +34,10 @@ public class HeartBeat { - @com.fasterxml.jackson.annotation.JsonProperty("id") + @JsonProperty("id") private long responseId = -1; - @com.fasterxml.jackson.annotation.JsonProperty("staleAlerts") + @JsonProperty("staleAlerts") private List staleAlerts = new ArrayList<>(); private long timestamp; @@ -93,13 +94,11 @@ public void setRecoveryTimestamp(long recoveryTimestamp) { } @JsonProperty("reports") - @com.fasterxml.jackson.annotation.JsonProperty("reports") public List getReports() { return reports; } @JsonProperty("reports") - @com.fasterxml.jackson.annotation.JsonProperty("reports") public void setReports(List reports) { this.reports = reports; } @@ -129,25 +128,21 @@ public void setAgentEnv(AgentEnv env) { } @JsonProperty("componentStatus") - @com.fasterxml.jackson.annotation.JsonProperty("componentStatus") public List getComponentStatus() { return componentStatus; } @JsonProperty("componentStatus") - @com.fasterxml.jackson.annotation.JsonProperty("componentStatus") public void setComponentStatus(List componentStatus) { this.componentStatus = componentStatus; } @JsonProperty("mounts") - @com.fasterxml.jackson.annotation.JsonProperty("mounts") public List getMounts() { return mounts; } @JsonProperty("mounts") - @com.fasterxml.jackson.annotation.JsonProperty("mounts") public void setMounts(List mounts) { this.mounts = mounts; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java index 67e585063f3..778295c9817 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java @@ -25,8 +25,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; + /** * Controller to Agent response data model. */ @@ -34,7 +36,7 @@ public class HeartBeatResponse extends StompResponse { @SerializedName("responseId") - @com.fasterxml.jackson.annotation.JsonProperty("id") + @JsonProperty("id") private long responseId; @SerializedName("executionCommands") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java index 6bbcbf6a6ad..c075c03020a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** * @@ -63,373 +63,311 @@ public class HostInfo { @JsonProperty("architecture") - @com.fasterxml.jackson.annotation.JsonProperty("architecture") public String getArchitecture() { return this.architecture; } @JsonProperty("architecture") - @com.fasterxml.jackson.annotation.JsonProperty("architecture") public void setArchitecture(String architecture) { this.architecture = architecture; } @JsonProperty("domain") - @com.fasterxml.jackson.annotation.JsonProperty("domain") public String getDomain() { return this.domain; } @JsonProperty("domain") - @com.fasterxml.jackson.annotation.JsonProperty("domain") public void setDomain(String domain) { this.domain = domain; } @JsonProperty("fqdn") - @com.fasterxml.jackson.annotation.JsonProperty("fqdn") public String getFQDN() { return this.fqdn; } @JsonProperty("fqdn") - @com.fasterxml.jackson.annotation.JsonProperty("fqdn") public void setFQDN(String fqdn) { this.fqdn = fqdn; } @JsonProperty("hardwareisa") - @com.fasterxml.jackson.annotation.JsonProperty("hardwareisa") public String getHardwareIsa() { return hardwareisa; } @JsonProperty("hardwareisa") - @com.fasterxml.jackson.annotation.JsonProperty("hardwareisa") public void setHardwareIsa(String hardwareisa) { this.hardwareisa = hardwareisa; } @JsonProperty("hardwaremodel") - @com.fasterxml.jackson.annotation.JsonProperty("hardwaremodel") public String getHardwareModel() { return this.hardwaremodel; } @JsonProperty("hardwaremodel") - @com.fasterxml.jackson.annotation.JsonProperty("hardwaremodel") public void setHardwareModel(String hardwaremodel) { this.hardwaremodel = hardwaremodel; } @JsonProperty("hostname") - @com.fasterxml.jackson.annotation.JsonProperty("hostname") public String getHostName() { return this.hostname; } @JsonProperty("hostname") - @com.fasterxml.jackson.annotation.JsonProperty("hostname") public void setHostName(String hostname) { this.hostname = hostname; } @JsonProperty("id") - @com.fasterxml.jackson.annotation.JsonProperty("id") public String getAgentUserId() { return id; } @JsonProperty("id") - @com.fasterxml.jackson.annotation.JsonProperty("id") public void setAgentUserId(String id) { this.id = id; } @JsonProperty("interfaces") - @com.fasterxml.jackson.annotation.JsonProperty("interfaces") public String getInterfaces() { return this.interfaces; } @JsonProperty("interfaces") - @com.fasterxml.jackson.annotation.JsonProperty("interfaces") public void setInterfaces(String interfaces) { this.interfaces = interfaces; } @JsonProperty("ipaddress") - @com.fasterxml.jackson.annotation.JsonProperty("ipaddress") public String getIPAddress() { return this.ipaddress; } @JsonProperty("ipaddress") - @com.fasterxml.jackson.annotation.JsonProperty("ipaddress") public void setIPAddress(String ipaddress) { this.ipaddress = ipaddress; } @JsonProperty("kernel") - @com.fasterxml.jackson.annotation.JsonProperty("kernel") public String getKernel() { return this.kernel; } @JsonProperty("kernel") - @com.fasterxml.jackson.annotation.JsonProperty("kernel") public void setKernel(String kernel) { this.kernel = kernel; } @JsonProperty("kernelmajversion") - @com.fasterxml.jackson.annotation.JsonProperty("kernelmajversion") public String getKernelMajVersion() { return this.kernelmajversion; } @JsonProperty("kernelmajversion") - @com.fasterxml.jackson.annotation.JsonProperty("kernelmajversion") public void setKernelMajVersion(String kernelmajversion) { this.kernelmajversion = kernelmajversion; } @JsonProperty("kernelrelease") - @com.fasterxml.jackson.annotation.JsonProperty("kernelrelease") public String getKernelRelease() { return this.kernelrelease; } @JsonProperty("kernelrelease") - @com.fasterxml.jackson.annotation.JsonProperty("kernelrelease") public void setKernelRelease(String kernelrelease) { this.kernelrelease = kernelrelease; } @JsonProperty("kernelversion") - @com.fasterxml.jackson.annotation.JsonProperty("kernelversion") public String getKernelVersion() { return this.kernelversion; } @JsonProperty("kernelversion") - @com.fasterxml.jackson.annotation.JsonProperty("kernelversion") public void setKernelVersion(String kernelversion) { this.kernelversion = kernelversion; } @JsonProperty("macaddress") - @com.fasterxml.jackson.annotation.JsonProperty("macaddress") public String getMacAddress() { return this.macaddress; } @JsonProperty("macaddress") - @com.fasterxml.jackson.annotation.JsonProperty("macaddress") public void setMacAddress(String macaddress) { this.macaddress = macaddress; } @JsonProperty("memoryfree") - @com.fasterxml.jackson.annotation.JsonProperty("memoryfree") public long getFreeMemory() { return this.memoryfree; } @JsonProperty("memoryfree") - @com.fasterxml.jackson.annotation.JsonProperty("memoryfree") public void setFreeMemory(long memoryfree) { this.memoryfree = memoryfree; } @JsonProperty("memorysize") - @com.fasterxml.jackson.annotation.JsonProperty("memorysize") public long getMemorySize() { return this.memorysize; } @JsonProperty("memorysize") - @com.fasterxml.jackson.annotation.JsonProperty("memorysize") public void setMemorySize(long memorysize) { this.memorysize = memorysize; } @JsonProperty("mounts") - @com.fasterxml.jackson.annotation.JsonProperty("mounts") public List getMounts() { return this.mounts; } @JsonProperty("mounts") - @com.fasterxml.jackson.annotation.JsonProperty("mounts") public void setMounts(List mounts) { this.mounts = mounts; } @JsonProperty("memorytotal") - @com.fasterxml.jackson.annotation.JsonProperty("memorytotal") public long getMemoryTotal() { return this.memorytotal; } @JsonProperty("memorytotal") - @com.fasterxml.jackson.annotation.JsonProperty("memorytotal") public void setMemoryTotal(long memorytotal) { this.memorytotal = memorytotal; } @JsonProperty("netmask") - @com.fasterxml.jackson.annotation.JsonProperty("netmask") public String getNetMask() { return this.netmask; } @JsonProperty("netmask") - @com.fasterxml.jackson.annotation.JsonProperty("netmask") public void setNetMask(String netmask) { this.netmask = netmask; } @JsonProperty("operatingsystem") - @com.fasterxml.jackson.annotation.JsonProperty("operatingsystem") public String getOS() { return this.operatingsystem; } @JsonProperty("operatingsystem") - @com.fasterxml.jackson.annotation.JsonProperty("operatingsystem") public void setOS(String operatingsystem) { this.operatingsystem = operatingsystem; } @JsonProperty("operatingsystemrelease") - @com.fasterxml.jackson.annotation.JsonProperty("operatingsystemrelease") public String getOSRelease() { return this.operatingsystemrelease; } @JsonProperty("operatingsystemrelease") - @com.fasterxml.jackson.annotation.JsonProperty("operatingsystemrelease") public void setOSRelease(String operatingsystemrelease) { this.operatingsystemrelease = operatingsystemrelease; } @JsonProperty("osfamily") - @com.fasterxml.jackson.annotation.JsonProperty("osfamily") public String getOSFamily() { return this.osfamily; } @JsonProperty("osfamily") - @com.fasterxml.jackson.annotation.JsonProperty("osfamily") public void setOSFamily(String osfamily) { this.osfamily = osfamily; } @JsonProperty("physicalprocessorcount") - @com.fasterxml.jackson.annotation.JsonProperty("physicalprocessorcount") public int getPhysicalProcessorCount() { return this.physicalprocessorcount; } @JsonProperty("physicalprocessorcount") - @com.fasterxml.jackson.annotation.JsonProperty("physicalprocessorcount") public void setPhysicalProcessorCount(int physicalprocessorcount) { this.physicalprocessorcount = physicalprocessorcount; } @JsonProperty("processorcount") - @com.fasterxml.jackson.annotation.JsonProperty("processorcount") public int getProcessorCount() { return this.processorcount; } @JsonProperty("processorcount") - @com.fasterxml.jackson.annotation.JsonProperty("processorcount") public void setProcessorCount(int processorcount) { this.processorcount = processorcount; } @JsonProperty("selinux") - @com.fasterxml.jackson.annotation.JsonProperty("selinux") public boolean getSeLinux() { return selinux; } @JsonProperty("selinux") - @com.fasterxml.jackson.annotation.JsonProperty("selinux") public void setSeLinux(boolean selinux) { this.selinux = selinux; } @JsonProperty("swapfree") - @com.fasterxml.jackson.annotation.JsonProperty("swapfree") public String getSwapFree() { return this.swapfree; } @JsonProperty("swapfree") - @com.fasterxml.jackson.annotation.JsonProperty("swapfree") public void setSwapFree(String swapfree) { this.swapfree = swapfree; } @JsonProperty("swapsize") - @com.fasterxml.jackson.annotation.JsonProperty("swapsize") public String getSwapSize() { return swapsize; } @JsonProperty("swapsize") - @com.fasterxml.jackson.annotation.JsonProperty("swapsize") public void setSwapSize(String swapsize) { this.swapsize = swapsize; } @JsonProperty("timezone") - @com.fasterxml.jackson.annotation.JsonProperty("timezone") public String getTimeZone() { return this.timezone; } @JsonProperty("timezone") - @com.fasterxml.jackson.annotation.JsonProperty("timezone") public void setTimeZone(String timezone) { this.timezone = timezone; } @JsonProperty("uptime") - @com.fasterxml.jackson.annotation.JsonProperty("uptime") public String getUptime() { return this.uptime; } @JsonProperty("uptime") - @com.fasterxml.jackson.annotation.JsonProperty("uptime") public void setUpTime(String uptime) { this.uptime = uptime; } @JsonProperty("uptime_hours") - @com.fasterxml.jackson.annotation.JsonProperty("uptime_hours") public long getUptimeHours() { return this.uptime_hours; } @JsonProperty("uptime_hours") - @com.fasterxml.jackson.annotation.JsonProperty("uptime_hours") public void setUpTimeHours(long uptime_hours) { this.uptime_hours = uptime_hours; } @JsonProperty("uptime_days") - @com.fasterxml.jackson.annotation.JsonProperty("uptime_days") public long getUpTimeDays() { return this.uptime_days; } @JsonProperty("uptime_days") - @com.fasterxml.jackson.annotation.JsonProperty("uptime_days") public void setUpTimeDays(long uptime_days) { this.uptime_days = uptime_days; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostStatus.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostStatus.java index 9942d9fc352..9134fd8bc3c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostStatus.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostStatus.java @@ -17,7 +17,7 @@ */ package org.apache.ambari.server.agent; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Status of the host as described by the agent. @@ -43,25 +43,21 @@ public enum Status { } @JsonProperty("status") - @com.fasterxml.jackson.annotation.JsonProperty("status") public Status getStatus() { return status; } @JsonProperty("status") - @com.fasterxml.jackson.annotation.JsonProperty("status") public void setStatus(Status status) { this.status = status; } @JsonProperty("cause") - @com.fasterxml.jackson.annotation.JsonProperty("cause") public String getCause() { return cause; } @JsonProperty("cause") - @com.fasterxml.jackson.annotation.JsonProperty("cause") public void setCause(String cause) { this.cause = cause; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java index be87993dcb6..dda825534a7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class RecoveryReport { @@ -34,30 +34,26 @@ public class RecoveryReport { @JsonProperty("summary") - @com.fasterxml.jackson.annotation.JsonProperty("summary") public String getSummary() { return summary; } @JsonProperty("summary") - @com.fasterxml.jackson.annotation.JsonProperty("summary") public void setSummary(String summary) { this.summary = summary; } @JsonProperty("component_reports") - @com.fasterxml.jackson.annotation.JsonProperty("component_reports") public List getComponentReports() { return componentReports; } @JsonProperty("component_reports") - @com.fasterxml.jackson.annotation.JsonProperty("component_reports") public void setComponentReports(List componentReports) { this.componentReports = componentReports; } - @Override + @Override public String toString() { String componentReportsStr = "[]"; if (componentReports != null) { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java index b3bad9d7908..822e99c731e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java @@ -18,12 +18,11 @@ package org.apache.ambari.server.agent; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAlias; +import com.fasterxml.jackson.annotation.JsonProperty; /** - * * Data model for Ambari Agent to send heartbeat to Ambari Controller. - * */ public class Register { private int responseId = -1; @@ -37,16 +36,16 @@ public class Register { private String agentVersion; private String prefix; - @JsonProperty("responseId") - @com.fasterxml.jackson.annotation.JsonProperty("id") + @JsonProperty("id") + @JsonAlias({"id", "responseId"}) public int getResponseId() { return responseId; } - @JsonProperty("responseId") - @com.fasterxml.jackson.annotation.JsonProperty("id") + @JsonProperty("id") + @JsonAlias( { "id", "responseId"}) public void setResponseId(int responseId) { - this.responseId=responseId; + this.responseId = responseId; } public long getTimestamp() { @@ -56,19 +55,19 @@ public long getTimestamp() { public String getHostname() { return hostname; } - + public void setHostname(String hostname) { this.hostname = hostname; } - + public HostInfo getHardwareProfile() { return hardwareProfile; } - + public void setHardwareProfile(HostInfo hardwareProfile) { this.hardwareProfile = hardwareProfile; } - + public void setTimestamp(long timestamp) { this.timestamp = timestamp; } @@ -76,15 +75,15 @@ public void setTimestamp(long timestamp) { public String getPublicHostname() { return publicHostname; } - + public void setPublicHostname(String name) { this.publicHostname = name; } - + public AgentEnv getAgentEnv() { return agentEnv; } - + public void setAgentEnv(AgentEnv env) { this.agentEnv = env; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java index a46ff084fa2..30779864448 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java @@ -23,10 +23,11 @@ import java.util.Map; import org.apache.ambari.server.agent.stomp.StompResponse; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; /** * @@ -54,19 +55,17 @@ public class RegistrationResponse extends StompResponse { * different version of agent and server) */ @JsonProperty("exitstatus") - @com.fasterxml.jackson.annotation.JsonProperty("exitstatus") - private int exitstatus; + private int exitStatus; /** * log - message, which will be printed to agents log */ @JsonProperty("log") - @com.fasterxml.jackson.annotation.JsonProperty("log") private String log; //Response id to start with, usually zero. - @JsonProperty("responseId") - @com.fasterxml.jackson.annotation.JsonProperty("id") + @JsonProperty("id") + @JsonAlias({"id","responseId"}) private long responseId; @JsonProperty("recoveryConfig") @@ -128,7 +127,7 @@ public void setResponseId(long responseId) { } public void setExitstatus(int exitstatus) { - this.exitstatus = exitstatus; + this.exitStatus = exitstatus; } public void setLog(String log) { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertStateSummary.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertStateSummary.java index 96db5be99f8..b54a85820ae 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertStateSummary.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertStateSummary.java @@ -18,7 +18,8 @@ package org.apache.ambari.server.api.query.render; import org.apache.ambari.server.state.AlertState; -import org.codehaus.jackson.annotate.JsonProperty; + +import com.fasterxml.jackson.annotation.JsonProperty; /** * The {@link AlertStateSummary} class holds information about each possible @@ -29,28 +30,24 @@ public final class AlertStateSummary { * The {@link AlertState#OK} state information. */ @JsonProperty(value = "OK") - @com.fasterxml.jackson.annotation.JsonProperty(value = "OK") public final AlertStateValues Ok = new AlertStateValues(); /** * The {@link AlertState#WARNING} state information. */ @JsonProperty(value = "WARNING") - @com.fasterxml.jackson.annotation.JsonProperty(value = "WARNING") public final AlertStateValues Warning = new AlertStateValues(); /** * The {@link AlertState#CRITICAL} state information. */ @JsonProperty(value = "CRITICAL") - @com.fasterxml.jackson.annotation.JsonProperty(value = "CRITICAL") public final AlertStateValues Critical = new AlertStateValues(); /** * The {@link AlertState#UNKNOWN} state information. */ @JsonProperty(value = "UNKNOWN") - @com.fasterxml.jackson.annotation.JsonProperty(value = "UNKNOWN") public final AlertStateValues Unknown = new AlertStateValues(); @Override diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertStateValues.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertStateValues.java index 607db571982..851274fdee1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertStateValues.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertStateValues.java @@ -17,10 +17,10 @@ */ package org.apache.ambari.server.api.query.render; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * The {@link AlertStateValues} class holds various information about an alert @@ -32,28 +32,24 @@ public final class AlertStateValues { * The total count of non-maintenance mode instances. */ @JsonProperty(value = "count") - @com.fasterxml.jackson.annotation.JsonProperty(value = "count") public int Count = 0; /** * The time of the last state change. */ @JsonProperty(value = "original_timestamp") - @com.fasterxml.jackson.annotation.JsonProperty(value = "original_timestamp") public long Timestamp = 0; /** * The total count of instances in maintenance mode. */ @JsonProperty(value = "maintenance_count") - @com.fasterxml.jackson.annotation.JsonProperty(value = "maintenance_count") public int MaintenanceCount = 0; /** * The most recently received text from any instance of the alert. */ @JsonProperty(value = "latest_text") - @com.fasterxml.jackson.annotation.JsonProperty(value = "latest_text") @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL) public String AlertText = null; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertSummaryGroupedRenderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertSummaryGroupedRenderer.java index b1493a67f30..5132483a2d9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertSummaryGroupedRenderer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertSummaryGroupedRenderer.java @@ -33,7 +33,8 @@ import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.state.AlertState; import org.apache.ambari.server.state.MaintenanceState; -import org.codehaus.jackson.annotate.JsonProperty; + +import com.fasterxml.jackson.annotation.JsonProperty; /** * The {@link AlertSummaryGroupedRenderer} is used to format the results of @@ -263,15 +264,12 @@ protected void addRequiredAlertProperties(Set properties) { */ public final static class AlertDefinitionSummary { @JsonProperty(value = "definition_id") - @com.fasterxml.jackson.annotation.JsonProperty(value = "definition_id") public long Id; @JsonProperty(value = "definition_name") - @com.fasterxml.jackson.annotation.JsonProperty(value = "definition_name") public String Name; @JsonProperty(value = "summary") - @com.fasterxml.jackson.annotation.JsonProperty(value = "summary") public final AlertStateSummary State = new AlertStateSummary(); @Override diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonRequestBodyParser.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonRequestBodyParser.java index d6772511801..14b91c4297b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonRequestBodyParser.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/JsonRequestBodyParser.java @@ -31,11 +31,12 @@ import org.apache.ambari.server.api.services.NamedPropertySet; import org.apache.ambari.server.api.services.RequestBody; import org.apache.ambari.server.controller.utilities.PropertyHelper; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + /** * JSON parser which parses a JSON string into a map of properties and values. */ @@ -58,7 +59,7 @@ public Set parse(String body) throws BodyParseException { try { JsonNode root = mapper.readTree(ensureArrayFormat(body)); - Iterator iterator = root.getElements(); + Iterator iterator = root.elements(); while (iterator.hasNext()) { JsonNode node = iterator.next(); Map mapProperties = new HashMap<>(); @@ -112,13 +113,13 @@ public Set parse(String body) throws BodyParseException { private void processNode(JsonNode node, String path, NamedPropertySet propertySet, Map requestInfoProps) throws IOException { - Iterator iterator = node.getFieldNames(); + Iterator iterator = node.fieldNames(); while (iterator.hasNext()) { String name = iterator.next(); JsonNode child = node.get(name); if (child.isArray()) { //array - Iterator arrayIter = child.getElements(); + Iterator arrayIter = child.elements(); Set> arraySet = new LinkedHashSet<>(); List primitives = new ArrayList<>(); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/JsonSerializer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/JsonSerializer.java index a045d74e2fc..1ab811fa354 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/JsonSerializer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/JsonSerializer.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.nio.charset.Charset; +import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; @@ -33,10 +34,12 @@ import org.apache.ambari.server.api.util.TreeNodeImpl; import org.apache.ambari.server.controller.internal.OperationStatusMetaData; import org.apache.ambari.server.controller.spi.Resource; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonGenerator; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.util.DefaultPrettyPrinter; + +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerationException; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; +import com.fasterxml.jackson.databind.ObjectMapper; /** * JSON serializer. @@ -98,9 +101,10 @@ public Object serializeError(ResultStatus error) { private ByteArrayOutputStream init() throws IOException { ByteArrayOutputStream bytesOut = new ByteArrayOutputStream(); m_generator = createJsonGenerator(bytesOut); - + Lf2SpacesIndenter indenter = new Lf2SpacesIndenter(); DefaultPrettyPrinter p = new DefaultPrettyPrinter(); - p.indentArraysWith(new DefaultPrettyPrinter.Lf2SpacesIndenter()); + p.indentObjectsWith(indenter); + p.indentArraysWith(indenter); m_generator.setPrettyPrinter(p); return bytesOut; @@ -276,8 +280,11 @@ private JsonGenerator createJsonGenerator(ByteArrayOutputStream baos) throws IOE JsonGenerator generator = m_factory.createJsonGenerator(new OutputStreamWriter(baos, Charset.forName("UTF-8").newEncoder())); + // Setup a pretty printer with an indenter (indenter has 2 spaces in this case) + Lf2SpacesIndenter indenter = new Lf2SpacesIndenter(); DefaultPrettyPrinter p = new DefaultPrettyPrinter(); - p.indentArraysWith(new DefaultPrettyPrinter.Lf2SpacesIndenter()); + p.indentObjectsWith(indenter); + p.indentArraysWith(indenter); generator.setPrettyPrinter(p); return generator; @@ -298,4 +305,41 @@ private void writeItemCount(TreeNode node) throws IOException { node.setProperty("count", null); } } + + private static class Lf2SpacesIndenter + implements DefaultPrettyPrinter.Indenter + { + final static String SYSTEM_LINE_SEPARATOR; + static { + String lf = null; + try { + lf = System.getProperty("line.separator"); + } catch (Throwable t) { } // access exception? + SYSTEM_LINE_SEPARATOR = (lf == null) ? "\n" : lf; + } + + final static int SPACE_COUNT = 64; + final static char[] SPACES = new char[SPACE_COUNT]; + static { + Arrays.fill(SPACES, ' '); + } + + public Lf2SpacesIndenter() { } + + @Override + public boolean isInline() { return false; } + + @Override + public void writeIndentation(JsonGenerator jg, int level) + throws IOException, JsonGenerationException + { + jg.writeRaw(SYSTEM_LINE_SEPARATOR); + level += level; // 2 spaces per level + while (level > SPACE_COUNT) { // should never happen but... + jg.writeRaw(SPACES, 0, SPACE_COUNT); + level -= SPACES.length; + } + jg.writeRaw(SPACES, 0, level); + } + } } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelper.java index e92bef819cc..b560c92c260 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelper.java @@ -44,8 +44,8 @@ import org.apache.ambari.server.state.ServiceInfo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codehaus.jackson.JsonNode; +import com.fasterxml.jackson.databind.JsonNode; import com.google.gson.Gson; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorResponse.java index 82d36a8fe80..915a951f0b2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorResponse.java @@ -18,7 +18,7 @@ package org.apache.ambari.server.api.services.stackadvisor; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Abstract stack advisor response POJO. diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommand.java index 5bd7cae9e25..d30b6295d88 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommand.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommand.java @@ -34,7 +34,8 @@ import org.apache.ambari.server.controller.internal.AmbariServerConfigurationHandler; import org.apache.ambari.server.state.ServiceInfo; import org.apache.commons.collections.CollectionUtils; -import org.codehaus.jackson.JsonNode; + +import com.fasterxml.jackson.databind.JsonNode; /** * {@link org.apache.ambari.server.api.services.stackadvisor.commands.StackAdvisorCommand} implementation for diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java index e7a8fba4901..e38c5ea2e96 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java @@ -55,16 +55,17 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.node.ArrayNode; -import org.codehaus.jackson.node.JsonNodeFactory; -import org.codehaus.jackson.node.ObjectNode; -import org.codehaus.jackson.node.TextNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.TextNode; + /** * Parent for all commands. */ @@ -130,7 +131,7 @@ public StackAdvisorCommand(File recommendationsDir, String recommendationsArtifa .getActualTypeArguments()[0]; this.mapper = new ObjectMapper(); - this.mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); + this.mapper.configure(SerializationFeature.INDENT_OUTPUT, true); this.recommendationsDir = recommendationsDir; this.recommendationsArtifactsLifetime = recommendationsArtifactsLifetime; @@ -263,17 +264,17 @@ protected void populateStackHierarchy(ObjectNode root) { private void populateComponentHostsMap(ObjectNode root, Map> componentHostsMap) { ArrayNode services = (ArrayNode) root.get(SERVICES_PROPERTY); - Iterator servicesIter = services.getElements(); + Iterator servicesIter = services.elements(); while (servicesIter.hasNext()) { JsonNode service = servicesIter.next(); ArrayNode components = (ArrayNode) service.get(SERVICES_COMPONENTS_PROPERTY); - Iterator componentsIter = components.getElements(); + Iterator componentsIter = components.elements(); while (componentsIter.hasNext()) { JsonNode component = componentsIter.next(); ObjectNode componentInfo = (ObjectNode) component.get(COMPONENT_INFO_PROPERTY); - String componentName = componentInfo.get(COMPONENT_NAME_PROPERTY).getTextValue(); + String componentName = componentInfo.get(COMPONENT_NAME_PROPERTY).asText(); Set componentHosts = componentHostsMap.get(componentName); ArrayNode hostnames = componentInfo.putArray(COMPONENT_HOSTNAMES_PROPERTY); @@ -288,7 +289,7 @@ private void populateComponentHostsMap(ObjectNode root, Map> private void populateServiceAdvisors(ObjectNode root) { ArrayNode services = (ArrayNode) root.get(SERVICES_PROPERTY); - Iterator servicesIter = services.getElements(); + Iterator servicesIter = services.elements(); ObjectNode version = (ObjectNode) root.get("Versions"); String stackName = version.get("stack_name").asText(); @@ -297,7 +298,7 @@ private void populateServiceAdvisors(ObjectNode root) { while (servicesIter.hasNext()) { JsonNode service = servicesIter.next(); ObjectNode serviceVersion = (ObjectNode) service.get(STACK_SERVICES_PROPERTY); - String serviceName = serviceVersion.get("service_name").getTextValue(); + String serviceName = serviceVersion.get("service_name").asText(); try { ServiceInfo serviceInfo = metaInfo.getService(stackName, stackVersion, serviceName); if (serviceInfo.getAdvisorFile() != null) { @@ -438,10 +439,10 @@ String getHostsInformation(StackAdvisorRequest request) throws StackAdvisorExcep if (hostsJSON != null && !hostsJSON.isEmpty()) { try { JsonNode root = mapper.readTree(hostsJSON); - Iterator iterator = root.get("items").getElements(); + Iterator iterator = root.get("items").elements(); while (iterator.hasNext()) { JsonNode next = iterator.next(); - String hostName = next.get("Hosts").get("host_name").getTextValue(); + String hostName = next.get("Hosts").get("host_name").asText(); hostInfoCache.put(hostName, next); resultInfos.add(next); } @@ -479,10 +480,10 @@ private Collection getUnregisteredHosts(String hostsJSON, List h try { JsonNode root = mapper.readTree(hostsJSON); - Iterator iterator = root.get("items").getElements(); + Iterator iterator = root.get("items").elements(); while (iterator.hasNext()) { JsonNode next = iterator.next(); - String hostName = next.get("Hosts").get("host_name").getTextValue(); + String hostName = next.get("Hosts").get("host_name").asText(); registeredHosts.add(hostName); } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/recommendations/RecommendationResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/recommendations/RecommendationResponse.java index 5d5247e9065..32a489eb473 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/recommendations/RecommendationResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/recommendations/RecommendationResponse.java @@ -35,11 +35,11 @@ import org.apache.ambari.server.state.ValueAttributesInfo; import org.apache.ambari.server.topology.ConfigurableHelper; import org.apache.commons.lang3.tuple.Pair; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; /** @@ -88,7 +88,7 @@ public static class Recommendation { private BlueprintClusterBinding blueprintClusterBinding; @JsonProperty("config-groups") - @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) private Set configGroups; public Blueprint getBlueprint() { @@ -151,7 +151,7 @@ public static class BlueprintConfigurations { private final Map properties = new HashMap<>(); @JsonProperty("property_attributes") - @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) private Map propertyAttributes = null; /** @@ -340,12 +340,12 @@ public static class ConfigGroup { private List hosts; @JsonProperty - @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) private Map configurations = new HashMap<>(); @JsonProperty("dependent_configurations") - @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) private Map dependentConfigurations = new HashMap<>(); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/validations/ValidationResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/validations/ValidationResponse.java index faf7ced6573..6550484ea2e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/validations/ValidationResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/validations/ValidationResponse.java @@ -21,8 +21,8 @@ import java.util.Set; import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorResponse; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects; /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/ClusterCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/ClusterCheck.java index 1e630dd5c31..a7a16a29dfe 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/ClusterCheck.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/ClusterCheck.java @@ -46,8 +46,8 @@ import org.apache.ambari.spi.upgrade.UpgradeCheckResult; import org.apache.ambari.spi.upgrade.UpgradeCheckType; import org.apache.commons.lang.StringUtils; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.Gson; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/HealthCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/HealthCheck.java index e32576e5da0..cc917a5eadf 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/HealthCheck.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/HealthCheck.java @@ -41,8 +41,8 @@ import org.apache.ambari.spi.upgrade.UpgradeCheckType; import org.apache.ambari.spi.upgrade.UpgradeType; import org.apache.commons.lang.StringUtils; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServiceCheckValidityCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServiceCheckValidityCheck.java index 3ffcabce882..8ac9364a7bf 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServiceCheckValidityCheck.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServiceCheckValidityCheck.java @@ -50,10 +50,10 @@ import org.apache.ambari.spi.upgrade.UpgradeCheckType; import org.apache.ambari.spi.upgrade.UpgradeType; import org.apache.commons.lang.StringUtils; -import org.codehaus.jackson.annotate.JsonProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AlertDefinitionResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AlertDefinitionResponse.java index a3aaa540bce..7cb2c59ad84 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AlertDefinitionResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AlertDefinitionResponse.java @@ -19,7 +19,8 @@ import org.apache.ambari.server.orm.entities.AlertDefinitionEntity; import org.apache.ambari.server.state.alert.SourceType; -import org.codehaus.jackson.annotate.JsonProperty; + +import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java index c4579fd22e2..3a53d251747 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java @@ -29,9 +29,10 @@ import org.apache.ambari.server.state.StackId; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.inject.Inject; import io.swagger.annotations.ApiModelProperty; @@ -51,7 +52,7 @@ public class ServiceConfigVersionResponse { @JsonProperty("cluster_name") - @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) private final String clusterName; @JsonProperty("service_name") @@ -61,7 +62,7 @@ public class ServiceConfigVersionResponse { private final Long version; @JsonProperty("createtime") - @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) private final Long createTime; @JsonProperty("group_id") @@ -71,11 +72,11 @@ public class ServiceConfigVersionResponse { private final String groupName; @JsonProperty("user") - @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) private final String userName; @JsonProperty("service_config_version_note") - @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) private final String note; @JsonProperty("stack_id") @@ -87,7 +88,7 @@ public class ServiceConfigVersionResponse { @JsonProperty("is_cluster_compatible") private final Boolean isCompatibleWithCurrentStack; - @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) private List configurations; @JsonProperty("hosts") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/WidgetResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/WidgetResponse.java index 32dee17c4e3..552ee1cc708 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/WidgetResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/WidgetResponse.java @@ -18,7 +18,8 @@ package org.apache.ambari.server.controller; import org.apache.ambari.server.orm.entities.WidgetEntity; -import org.codehaus.jackson.annotate.JsonProperty; + +import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceFilter.java index e6ae97f45c0..f678c2bd0e6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceFilter.java @@ -21,8 +21,9 @@ import java.util.List; import org.apache.ambari.server.controller.ApiModel; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; public class RequestResourceFilter implements ApiModel { private String serviceName; @@ -41,19 +42,19 @@ public RequestResourceFilter(String serviceName, String componentName, List getHostNames() { return hostNames; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java index 9eed8375677..9f739535def 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java @@ -42,10 +42,10 @@ import org.apache.ambari.server.orm.entities.HostRoleCommandEntity; import org.apache.ambari.server.topology.TopologyManager; import org.apache.ambari.server.utils.StageUtils; -import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java index b13444b311c..0f7ddf73ce0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java @@ -115,10 +115,10 @@ import org.apache.ambari.spi.upgrade.UpgradeType; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.codehaus.jackson.annotate.JsonProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.gson.JsonArray; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java index 5d5a5a1ed3d..d3f801a01da 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java @@ -72,12 +72,12 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.apache.http.HttpStatus; -import org.codehaus.jackson.node.ArrayNode; -import org.codehaus.jackson.node.JsonNodeFactory; -import org.codehaus.jackson.node.ObjectNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.base.Function; import com.google.common.collect.Collections2; import com.google.common.collect.ListMultimap; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/HostComponentLoggingInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/HostComponentLoggingInfo.java index a07d2294fab..b74a14d6191 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/HostComponentLoggingInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/HostComponentLoggingInfo.java @@ -21,7 +21,7 @@ import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class HostComponentLoggingInfo { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/HostLogFilesResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/HostLogFilesResponse.java index 2de1af2e10c..d3433f0871b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/HostLogFilesResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/HostLogFilesResponse.java @@ -21,9 +21,8 @@ import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; - +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public class HostLogFilesResponse { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogFileDefinitionInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogFileDefinitionInfo.java index 0bb40cdb422..a069d75113a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogFileDefinitionInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogFileDefinitionInfo.java @@ -19,7 +19,7 @@ package org.apache.ambari.server.controller.logging; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class LogFileDefinitionInfo { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogLevelQueryResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogLevelQueryResponse.java index 6266a6618b7..499389ffc53 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogLevelQueryResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogLevelQueryResponse.java @@ -19,8 +19,8 @@ import java.util.List; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public class LogLevelQueryResponse { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogLineResult.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogLineResult.java index 331dfb295c5..20cb03b5319 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogLineResult.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogLineResult.java @@ -21,8 +21,8 @@ import java.util.HashMap; import java.util.Map; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /** * This class represents a single entry from a LogSearch query. diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogQueryResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogQueryResponse.java index 2bf7778f570..f485a34d903 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogQueryResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LogQueryResponse.java @@ -20,8 +20,8 @@ import java.util.List; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /** * This class respresents the results of a LogSearch query, as returned by diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java index 4c7d0312960..f3807769c0a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java @@ -54,14 +54,15 @@ import org.apache.commons.collections.MapUtils; import org.apache.commons.lang.StringUtils; import org.apache.http.client.utils.URIBuilder; -import org.codehaus.jackson.map.AnnotationIntrospector; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.ObjectReader; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.AnnotationIntrospector; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; + /** * Convenience class to handle the connection details of a LogSearch query request. @@ -480,7 +481,7 @@ protected static ObjectMapper createJSONObjectMapper() { AnnotationIntrospector introspector = new JacksonAnnotationIntrospector(); mapper.setAnnotationIntrospector(introspector); - mapper.getSerializationConfig().setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); return mapper; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/NameValuePair.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/NameValuePair.java index 826e6e9db45..b3ca5c66bbb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/NameValuePair.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/NameValuePair.java @@ -17,7 +17,7 @@ */ package org.apache.ambari.server.controller.logging; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class NameValuePair { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaMetric.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaMetric.java index 9579f5ddb3f..fadb1532648 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaMetric.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaMetric.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Set; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; /** * Data structure for temporal data returned from Ganglia Web. diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProvider.java index e709a8d9481..7cca0dc8a37 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProvider.java @@ -37,11 +37,12 @@ import org.apache.ambari.server.controller.spi.SystemException; import org.apache.ambari.server.controller.spi.TemporalInfo; import org.apache.ambari.server.controller.utilities.StreamProvider; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + /** * Property provider implementation for a Ganglia source. This provider is specialized * to pull metrics from existing Ganglia reports. diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java index 062c228a1e2..240051eb624 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java @@ -39,14 +39,15 @@ import org.apache.http.HttpStatus; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URIBuilder; -import org.codehaus.jackson.map.AnnotationIntrospector; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.ObjectReader; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.xc.JaxbAnnotationIntrospector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.AnnotationIntrospector; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; + /** * Helper class to call AMS backend that is utilized by @AMSPropertyProvider * and @AMSReportPropertyProvider as well as @TimelineMetricCacheEntryFactory @@ -62,7 +63,7 @@ public class MetricsRequestHelper { AnnotationIntrospector introspector = new JaxbAnnotationIntrospector(); mapper.setAnnotationIntrospector(introspector); //noinspection deprecation - mapper.getSerializationConfig().setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); timelineObjectReader = mapper.reader(TimelineMetrics.class); } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java index 8aaffe8068c..0cfead0fff9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java @@ -36,9 +36,9 @@ import org.apache.ambari.server.controller.spi.SortRequest; import org.apache.ambari.server.controller.spi.TemporalInfo; import org.apache.commons.lang.StringUtils; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java b/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java index eddb5c8217c..f8d0501848b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java @@ -45,10 +45,10 @@ import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.svccomphost.ServiceComponentHostServerActionEvent; -import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.eventbus.Subscribe; /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/models/HostComponentSummary.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/models/HostComponentSummary.java index 5886ea7ebfe..bbb58229cd5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/models/HostComponentSummary.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/models/HostComponentSummary.java @@ -29,8 +29,8 @@ import org.apache.ambari.server.orm.entities.HostComponentStateEntity; import org.apache.ambari.server.orm.entities.HostEntity; import org.apache.ambari.server.state.State; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.inject.Inject; /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerAction.java index 107d44b3b8d..17c55ba1895 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerAction.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerAction.java @@ -33,10 +33,10 @@ import org.apache.ambari.server.hooks.users.UserHookParams; import org.apache.ambari.server.serveraction.AbstractServerAction; import org.apache.ambari.server.utils.ShellCommandUtil; -import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Splitter; @Singleton diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java index 151e10f9ad6..340758fc8da 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java @@ -30,10 +30,11 @@ import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.state.QuickLinksConfigurationInfo; import org.apache.ambari.server.state.quicklinks.QuickLinks; -import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.databind.ObjectMapper; + public class QuickLinksConfigurationModule extends BaseModule implements Validable { private static final Logger LOG = LoggerFactory.getLogger(QuickLinksConfigurationModule.class); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java index 36cfc2853e7..32782c4afef 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java @@ -28,11 +28,12 @@ import org.apache.ambari.server.state.ServiceInfo; import org.apache.ambari.server.state.stack.ServiceMetainfoXml; import org.apache.ambari.server.state.stack.StackRoleCommandOrder; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + /** * Encapsulates IO operations on a stack definition service directory. */ @@ -441,7 +442,7 @@ private void parseRoleCommandOrder() { try { ObjectMapper mapper = new ObjectMapper(); TypeReference> rcoElementTypeReference = new TypeReference>() {}; - HashMap result = mapper.readValue(rcoFile, rcoElementTypeReference); + HashMap result = (HashMap) mapper.readValue(rcoFile, rcoElementTypeReference); LOG.info("Role command order info was loaded from file: {}", rcoFile.getAbsolutePath()); roleCommandOrder = new StackRoleCommandOrder(result); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java index 5b1a6bca991..4b40a1f4657 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java @@ -46,12 +46,13 @@ import org.apache.ambari.server.state.stack.StackMetainfoXml; import org.apache.ambari.server.state.stack.StackRoleCommandOrder; import org.apache.commons.io.FilenameUtils; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.ClassUtils; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + /** * Encapsulates IO operations on a stack definition stack directory. */ @@ -510,7 +511,7 @@ private void parseRoleCommandOrder() { }; if (rcoFilePath != null) { File file = new File(rcoFilePath); - result = mapper.readValue(file, rcoElementTypeReference); + result = (HashMap) mapper.readValue(file, rcoElementTypeReference); LOG.info("Role command order info was loaded from file: {}", file.getAbsolutePath()); } else { LOG.info("Stack '{}' doesn't contain role command order file", getPath()); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java index 48fc8ae11ab..ed13ea9fb0b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java @@ -30,10 +30,11 @@ import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.state.ThemeInfo; import org.apache.ambari.server.state.theme.Theme; -import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.databind.ObjectMapper; + public class ThemeModule extends BaseModule implements Validable { private static final Logger LOG = LoggerFactory.getLogger(ThemeModule.class); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/Alert.java b/ambari-server/src/main/java/org/apache/ambari/server/state/Alert.java index 5bb2590645e..f2f78a21eb2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/Alert.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/Alert.java @@ -20,7 +20,9 @@ import java.util.Objects; import org.apache.commons.lang.StringUtils; -import org.codehaus.jackson.annotate.JsonProperty; + +import com.fasterxml.jackson.annotation.JsonProperty; + /** * An alert represents a problem or notice for a cluster. */ @@ -68,9 +70,7 @@ public Alert() { /** * @return the name */ - @JsonProperty("name") - @com.fasterxml.jackson.annotation.JsonProperty("name") public String getName() { return name; } @@ -79,7 +79,6 @@ public String getName() { * @return the service */ @JsonProperty("service") - @com.fasterxml.jackson.annotation.JsonProperty("service") public String getService() { return service; } @@ -88,7 +87,6 @@ public String getService() { * @return the component */ @JsonProperty("component") - @com.fasterxml.jackson.annotation.JsonProperty("component") public String getComponent() { return component; } @@ -97,7 +95,6 @@ public String getComponent() { * @return the host */ @JsonProperty("host") - @com.fasterxml.jackson.annotation.JsonProperty("host") public String getHostName() { return hostName; } @@ -106,7 +103,6 @@ public String getHostName() { * @return the state */ @JsonProperty("state") - @com.fasterxml.jackson.annotation.JsonProperty("state") public AlertState getState() { return state; } @@ -115,7 +111,6 @@ public AlertState getState() { * @return a short descriptive label for the alert */ @JsonProperty("label") - @com.fasterxml.jackson.annotation.JsonProperty("label") public String getLabel() { return label; } @@ -124,7 +119,6 @@ public String getLabel() { * @param alertLabel a short descriptive label for the alert */ @JsonProperty("label") - @com.fasterxml.jackson.annotation.JsonProperty("label") public void setLabel(String alertLabel) { label = alertLabel; } @@ -133,7 +127,6 @@ public void setLabel(String alertLabel) { * @return detail text about the alert */ @JsonProperty("text") - @com.fasterxml.jackson.annotation.JsonProperty("text") public String getText() { return text; } @@ -142,76 +135,67 @@ public String getText() { * @param alertText detail text about the alert */ @JsonProperty("text") - @com.fasterxml.jackson.annotation.JsonProperty("text") public void setText(String alertText) { // middle-ellipsize the text to reduce the size to 32617 characters text = StringUtils.abbreviateMiddle(alertText, "…", MAX_ALERT_TEXT_SIZE); } @JsonProperty("instance") - @com.fasterxml.jackson.annotation.JsonProperty("instance") public String getInstance() { return instance; } @JsonProperty("instance") - @com.fasterxml.jackson.annotation.JsonProperty("instance") public void setInstance(String instance) { this.instance = instance; } @JsonProperty("name") - @com.fasterxml.jackson.annotation.JsonProperty("name") public void setName(String name) { this.name = name; } @JsonProperty("service") - @com.fasterxml.jackson.annotation.JsonProperty("service") public void setService(String service) { this.service = service; } @JsonProperty("component") - @com.fasterxml.jackson.annotation.JsonProperty("component") public void setComponent(String component) { this.component = component; } @JsonProperty("host") - @com.fasterxml.jackson.annotation.JsonProperty("host") public void setHostName(String hostName) { this.hostName = hostName; } @JsonProperty("state") - @com.fasterxml.jackson.annotation.JsonProperty("state") public void setState(AlertState state) { this.state = state; } @JsonProperty("timestamp") - @com.fasterxml.jackson.annotation.JsonProperty("timestamp") public void setTimestamp(long ts) { timestamp = ts; } @JsonProperty("timestamp") - @com.fasterxml.jackson.annotation.JsonProperty("timestamp") public long getTimestamp() { return timestamp; } - @com.fasterxml.jackson.annotation.JsonProperty("clusterId") + @JsonProperty("clusterId") public Long getClusterId() { return clusterId; } + @JsonProperty("clusterId") public void setClusterId(Long clusterId) { this.clusterId = clusterId; } - @com.fasterxml.jackson.annotation.JsonProperty("uuid") + @JsonProperty("uuid") public String getUUID() { return uuid; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ChangedConfigInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ChangedConfigInfo.java index 03bf71a01be..4bdbd2fcf9f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/ChangedConfigInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ChangedConfigInfo.java @@ -18,7 +18,7 @@ package org.apache.ambari.server.state; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class ChangedConfigInfo { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ClusterHealthReport.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ClusterHealthReport.java index 95794b4ce88..2fa0ae6d7e8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/ClusterHealthReport.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ClusterHealthReport.java @@ -18,7 +18,7 @@ package org.apache.ambari.server.state; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/DesiredConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/state/DesiredConfig.java index 4fad21d4964..818f6d76491 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/DesiredConfig.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/DesiredConfig.java @@ -22,9 +22,9 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Class that holds information about a desired config and is suitable for output @@ -58,7 +58,7 @@ public String getTag() { * Gets the service name (if any) for the desired config. * @return the service name */ - @JsonSerialize(include = Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) @JsonProperty("service_name") public String getServiceName() { return serviceName; @@ -84,7 +84,7 @@ public void setHostOverrides(List overrides) { * Gets the host overrides for the desired config. Cluster-based desired configs only. * @return the host names that override the desired config */ - @JsonSerialize(include = Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("host_overrides") public List getHostOverrides() { return hostOverrides; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/HostConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/state/HostConfig.java index 5395f4ced49..b4c9d2a7b6d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/HostConfig.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/HostConfig.java @@ -20,9 +20,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Objects; /** @@ -46,7 +46,7 @@ public void setDefaultVersionTag(String defaultVersionTag) { this.defaultVersionTag = defaultVersionTag; } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_NULL) @JsonProperty("overrides") public Map getConfigGroupOverrides() { return configGroupOverrides; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHostEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHostEvent.java index 55a5713704c..82dc9bb40b6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHostEvent.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHostEvent.java @@ -36,8 +36,9 @@ import org.apache.ambari.server.state.svccomphost.ServiceComponentHostUninstallEvent; import org.apache.ambari.server.state.svccomphost.ServiceComponentHostUpgradeEvent; import org.apache.ambari.server.state.svccomphost.ServiceComponentHostWipeoutEvent; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Base class for all events that affect the ServiceComponentHost FSM diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java index 117b51f2128..e0504bdd148 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java @@ -47,9 +47,9 @@ import org.apache.ambari.server.state.stack.MetricDefinition; import org.apache.ambari.server.state.stack.StackRoleCommandOrder; import org.apache.commons.lang.StringUtils; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.map.annotate.JsonFilter; +import com.fasterxml.jackson.annotation.JsonFilter; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/UserGroupInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/UserGroupInfo.java index a8c4322875a..10d805cce42 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/UserGroupInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/UserGroupInfo.java @@ -21,10 +21,10 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonInclude; @XmlAccessorType(XmlAccessType.FIELD) -@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) public class UserGroupInfo { private String type; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ValueAttributesInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ValueAttributesInfo.java index f8ddf0baa9a..816c01cb1a7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/ValueAttributesInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ValueAttributesInfo.java @@ -29,15 +29,16 @@ import javax.xml.bind.annotation.XmlElements; import org.apache.ambari.server.controller.ApiModel; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.type.TypeReference; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.annotations.ApiModelProperty; @XmlAccessorType(XmlAccessType.FIELD) -@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) public class ValueAttributesInfo implements ApiModel { public static final String EMPTY_VALUE_VALID = "empty_value_valid"; public static final String UI_ONLY_PROPERTY = "ui_only_property"; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ValueEntryInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ValueEntryInfo.java index 59745290d59..ac0a55bcbc9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/ValueEntryInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ValueEntryInfo.java @@ -21,13 +21,15 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; + import org.apache.ambari.server.controller.ApiModel; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; @XmlAccessorType(XmlAccessType.FIELD) -@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) public class ValueEntryInfo implements ApiModel { private String value; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertGroup.java b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertGroup.java index c52cc7c18be..cc2f532bdbc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertGroup.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertGroup.java @@ -17,7 +17,7 @@ */ package org.apache.ambari.server.state.alert; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** * The {@link AlertGroup} class is used to represent a grouping of alert diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertTarget.java b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertTarget.java index 13efe5ea6cc..29b11601594 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertTarget.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertTarget.java @@ -20,7 +20,8 @@ import java.util.Map; import org.apache.ambari.server.orm.entities.AlertTargetEntity; -import org.codehaus.jackson.annotate.JsonProperty; + +import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Check.java b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Check.java index 7b68920b4bb..212b6b5ae75 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Check.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Check.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.state.quicklinks; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class Check{ @JsonProperty("property") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Host.java b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Host.java index 074d4e7ba4d..1bb0d72a9f4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Host.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Host.java @@ -18,14 +18,14 @@ package org.apache.ambari.server.state.quicklinks; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Quick links may override host names of host components with host names that come from configuration. */ -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class Host { /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Link.java b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Link.java index 4e8e8a373ca..8edcf76b32f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Link.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Link.java @@ -22,11 +22,11 @@ import javax.annotation.Nullable; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class Link{ @JsonProperty("name") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Port.java b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Port.java index fa35ab93c2c..c93415268b0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Port.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Port.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.state.quicklinks; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class Port{ @JsonProperty("http_property") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Protocol.java b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Protocol.java index c175c56b5cc..9a78c994ff8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Protocol.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/Protocol.java @@ -20,11 +20,12 @@ import java.util.List; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class Protocol{ @JsonProperty("type") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/QuickLinks.java b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/QuickLinks.java index a91b53c165b..fb9212f4a1f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/QuickLinks.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/QuickLinks.java @@ -18,11 +18,12 @@ package org.apache.ambari.server.state.quicklinks; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class QuickLinks{ @JsonProperty("description") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/QuickLinksConfiguration.java b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/QuickLinksConfiguration.java index 50e13d0f104..20297e05054 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/QuickLinksConfiguration.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinks/QuickLinksConfiguration.java @@ -23,11 +23,11 @@ import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class QuickLinksConfiguration{ @JsonProperty("protocol") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/AvailableService.java b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/AvailableService.java index 10e55d9c79f..8f76d428100 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/AvailableService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/AvailableService.java @@ -20,9 +20,8 @@ import java.util.ArrayList; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; /** * A representation of a {@link ManifestService} that is available for upgrading. This @@ -34,7 +33,7 @@ public class AvailableService { private String name; @JsonProperty("display_name") - @JsonSerialize(include=Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) private String displayName; private List versions = new ArrayList<>(); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/AvailableVersion.java b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/AvailableVersion.java index dd2cb33b29b..a630a224c9c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/AvailableVersion.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/AvailableVersion.java @@ -19,9 +19,8 @@ import java.util.Set; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Represents a version of a {@link ManifestService} that is available for upgrading. @@ -34,11 +33,11 @@ public class AvailableVersion { private String version; @JsonProperty("release_version") - @JsonSerialize(include=Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) private String releaseVersion; @JsonProperty("version_id") - @JsonSerialize(include=Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) private String versionId; @JsonProperty diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/ClusterVersionSummary.java b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/ClusterVersionSummary.java index 5486ecd9501..23212ac5076 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/ClusterVersionSummary.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/ClusterVersionSummary.java @@ -21,9 +21,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; - +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/ManifestServiceInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/ManifestServiceInfo.java index 8d88509108c..1bc812a3566 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/ManifestServiceInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/ManifestServiceInfo.java @@ -19,7 +19,7 @@ import java.util.Set; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Used when formulating manifest info for API consumption. @@ -51,5 +51,36 @@ public ManifestServiceInfo(String name, String display, String comment, Set m_versions) { + this.m_versions = m_versions; + } + + public Set getM_versions() { + return m_versions; + } } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/ServiceVersionSummary.java b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/ServiceVersionSummary.java index d87caef0458..09afd853c7f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/ServiceVersionSummary.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/ServiceVersionSummary.java @@ -17,9 +17,8 @@ */ package org.apache.ambari.server.state.repository; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; - +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/Batch.java b/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/Batch.java index 04542b611f4..310c5a4ddd5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/Batch.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/Batch.java @@ -20,20 +20,20 @@ import java.util.ArrayList; import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; public class Batch { private final List batchRequests = new ArrayList<>(); private BatchSettings batchSettings; - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("batch_requests") public List getBatchRequests() { return batchRequests; } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("batch_settings") public BatchSettings getBatchSettings() { return batchSettings; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/BatchRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/BatchRequest.java index a6d194ff171..90964768214 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/BatchRequest.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/BatchRequest.java @@ -17,8 +17,8 @@ */ package org.apache.ambari.server.state.scheduler; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; public class BatchRequest implements Comparable { private Long orderId; @@ -66,7 +66,7 @@ public void setUri(String uri) { this.uri = uri; } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("request_body") public String getBody() { return body; @@ -76,7 +76,7 @@ public void setBody(String body) { this.body = body; } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("request_status") public String getStatus() { return status; @@ -86,7 +86,7 @@ public void setStatus(String status) { this.status = status; } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("return_code") public Integer getReturnCode() { return returnCode; @@ -96,7 +96,7 @@ public void setReturnCode(Integer returnCode) { this.returnCode = returnCode; } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("response_message") public String getResponseMsg() { return responseMsg; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/BatchSettings.java b/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/BatchSettings.java index c11480b8ada..0b005172acc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/BatchSettings.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/BatchSettings.java @@ -17,8 +17,9 @@ */ package org.apache.ambari.server.state.scheduler; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; public class BatchSettings { private Integer batchSeparationInSeconds; @@ -26,7 +27,7 @@ public class BatchSettings { private Integer taskFailureTolerancePerBatch; private Boolean pauseAfterFirstBatch = false; - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("batch_separation_in_seconds") public Integer getBatchSeparationInSeconds() { return batchSeparationInSeconds; @@ -36,7 +37,7 @@ public void setBatchSeparationInSeconds(Integer batchSeparationInSeconds) { this.batchSeparationInSeconds = batchSeparationInSeconds; } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("task_failure_tolerance_limit") public Integer getTaskFailureToleranceLimit() { return taskFailureTolerance; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/Schedule.java b/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/Schedule.java index ee90ad0e6c2..5178b4b6534 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/Schedule.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/scheduler/Schedule.java @@ -17,9 +17,9 @@ */ package org.apache.ambari.server.state.scheduler; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; public class Schedule { private String minutes; @@ -31,7 +31,7 @@ public class Schedule { private String startTime; private String endTime; - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("minutes") public String getMinutes() { return minutes; @@ -41,7 +41,7 @@ public void setMinutes(String minutes) { this.minutes = minutes; } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("hours") public String getHours() { return hours; @@ -51,7 +51,7 @@ public void setHours(String hours) { this.hours = hours; } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("days_of_month") public String getDaysOfMonth() { return daysOfMonth; @@ -61,7 +61,7 @@ public void setDaysOfMonth(String daysOfMonth) { this.daysOfMonth = daysOfMonth; } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("month") public String getMonth() { return month; @@ -71,7 +71,7 @@ public void setMonth(String month) { this.month = month; } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("day_of_week") public String getDayOfWeek() { return dayOfWeek; @@ -81,7 +81,7 @@ public void setDayOfWeek(String dayOfWeek) { this.dayOfWeek = dayOfWeek; } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("year") public String getYear() { return year; @@ -91,7 +91,7 @@ public void setYear(String year) { this.year = year; } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("start_time") public String getStartTime() { return startTime; @@ -101,7 +101,7 @@ public void setStartTime(String startTime) { this.startTime = startTime; } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonProperty("end_time") public String getEndTime() { return endTime; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/services/MetricsRetrievalService.java b/ambari-server/src/main/java/org/apache/ambari/server/state/services/MetricsRetrievalService.java index 10f2b051b69..081421ae452 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/services/MetricsRetrievalService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/services/MetricsRetrievalService.java @@ -39,13 +39,13 @@ import org.apache.ambari.server.controller.utilities.ScalingThreadPoolExecutor; import org.apache.ambari.server.controller.utilities.StreamProvider; import org.apache.commons.io.IOUtils; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.ObjectReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.collect.Sets; @@ -182,7 +182,7 @@ public enum MetricSourceType { */ public MetricsRetrievalService() { ObjectMapper jmxObjectMapper = new ObjectMapper(); - jmxObjectMapper.configure(DeserializationConfig.Feature.USE_ANNOTATIONS, false); + jmxObjectMapper.configure(MapperFeature.USE_ANNOTATIONS, false); jmxObjectMapper.configure(JsonParser.Feature.ALLOW_NON_NUMERIC_NUMBERS, true); m_jmxObjectReader = jmxObjectMapper.reader(JMXMetricHolder.class); } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/MetricDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/MetricDefinition.java index 181794f1bfa..97c5d099045 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/MetricDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/MetricDefinition.java @@ -24,9 +24,9 @@ import java.util.Optional; import org.apache.ambari.server.state.UriInfo; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/WidgetLayout.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/WidgetLayout.java index 6d2211d4024..d3f2d079d4f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/WidgetLayout.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/WidgetLayout.java @@ -19,8 +19,7 @@ import java.util.List; -import org.codehaus.jackson.annotate.JsonProperty; - +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; public class WidgetLayout { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/WidgetLayoutInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/WidgetLayoutInfo.java index a8a96bdfa14..d7f6c295e77 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/WidgetLayoutInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/WidgetLayoutInfo.java @@ -20,8 +20,7 @@ import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonProperty; - +import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.annotations.SerializedName; public class WidgetLayoutInfo { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ConfigCondition.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ConfigCondition.java index 166ccd719fd..701c06f4f0e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ConfigCondition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ConfigCondition.java @@ -22,13 +22,14 @@ import org.apache.ambari.server.controller.ApiModel; import org.apache.ambari.server.state.ValueAttributesInfo; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class ConfigCondition implements ApiModel { @JsonProperty("configs") @@ -88,7 +89,7 @@ public void setResource(String resource) { this.resource = resource; } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public static class ConfigConditionResult implements ApiModel { @JsonProperty("property_value_attributes") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ConfigPlacement.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ConfigPlacement.java index 94db9951903..45d12c4fc3e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ConfigPlacement.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ConfigPlacement.java @@ -21,13 +21,14 @@ import java.util.List; import org.apache.ambari.server.state.ValueAttributesInfo; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class ConfigPlacement { private static final String PROPERTY_VALUE_ATTRIBUTES = "property_value_attributes"; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Layout.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Layout.java index 672b540f71f..65e2b434aec 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Layout.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Layout.java @@ -24,13 +24,14 @@ import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class Layout{ diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Placement.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Placement.java index 0525c84260a..b60ee2caa7a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Placement.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Placement.java @@ -24,12 +24,13 @@ import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) + +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class Placement{ @JsonProperty("configs") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Section.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Section.java index cfc539603ac..9c3610bc1c8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Section.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Section.java @@ -25,13 +25,14 @@ import java.util.Map; import org.apache.ambari.server.controller.ApiModel; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class Section implements ApiModel { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Subsection.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Subsection.java index eb94f57c978..4d997725ca6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Subsection.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Subsection.java @@ -20,13 +20,14 @@ import java.util.List; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class Subsection { @JsonProperty("row-index") @@ -176,7 +177,7 @@ public void mergeWithParent(Subsection parent) { } } - @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) private static class SubsectionTab { @JsonProperty("name") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Tab.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Tab.java index 1d1d60c4441..5e34fcc4523 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Tab.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Tab.java @@ -19,13 +19,14 @@ package org.apache.ambari.server.state.theme; import org.apache.ambari.server.controller.ApiModel; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class Tab implements ApiModel { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java index bbf8bb87c70..74422825b7c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java @@ -23,13 +23,13 @@ import java.util.List; import java.util.Map; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class TabLayout { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Theme.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Theme.java index 12172309ae2..bd37839abe2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Theme.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Theme.java @@ -19,13 +19,14 @@ package org.apache.ambari.server.state.theme; import org.apache.ambari.server.controller.ApiModel; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class Theme implements ApiModel{ @JsonProperty("description") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ThemeConfiguration.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ThemeConfiguration.java index f264b0acbfa..9b336c2097a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ThemeConfiguration.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ThemeConfiguration.java @@ -24,13 +24,14 @@ import java.util.Map; import org.apache.ambari.server.controller.ApiModel; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class ThemeConfiguration implements ApiModel { @JsonProperty("placement") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Unit.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Unit.java index 953939c98f2..a4bd225be01 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Unit.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Unit.java @@ -19,13 +19,14 @@ package org.apache.ambari.server.state.theme; import org.apache.ambari.server.controller.ApiModel; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class Unit implements ApiModel { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Widget.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Widget.java index 73bd138c958..1d907a61268 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Widget.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Widget.java @@ -22,13 +22,14 @@ import java.util.Map; import org.apache.ambari.server.controller.ApiModel; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class Widget implements ApiModel { @JsonProperty("type") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/WidgetEntry.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/WidgetEntry.java index 6aac03fccb3..f84d85a2e67 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/WidgetEntry.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/WidgetEntry.java @@ -19,13 +19,14 @@ package org.apache.ambari.server.state.theme; import org.apache.ambari.server.controller.ApiModel; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -@JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class WidgetEntry implements ApiModel { @JsonProperty("config") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java index aa3cb74bb7e..280d4821dc3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java @@ -65,13 +65,14 @@ import org.apache.ambari.server.state.svccomphost.ServiceComponentHostInstallEvent; import org.apache.ambari.server.topology.TopologyManager; import org.apache.commons.lang.StringUtils; -import org.codehaus.jackson.JsonGenerationException; -import org.codehaus.jackson.map.JsonMappingException; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.core.JsonGenerationException; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import com.google.common.base.Joiner; import com.google.common.collect.Sets; import com.google.gson.Gson; @@ -257,8 +258,8 @@ public static String jaxbToString(Object jaxbObj) throws JAXBException, public static T fromJson(String json, Class clazz) throws IOException { ObjectMapper mapper = new ObjectMapper(); - mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); - mapper.configure(SerializationConfig.Feature.USE_ANNOTATIONS, true); + mapper.configure(SerializationFeature.INDENT_OUTPUT, true); + mapper.configure(MapperFeature.USE_ANNOTATIONS, true); InputStream is = new ByteArrayInputStream(json.getBytes(Charset.forName("UTF8"))); return mapper.readValue(is, clazz); } diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentHostInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentHostInfoTest.java index 6bf3180bbcb..efebd56dd76 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentHostInfoTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentHostInfoTest.java @@ -21,12 +21,13 @@ import java.io.IOException; -import org.codehaus.jackson.JsonParseException; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.JsonMappingException; -import org.codehaus.jackson.map.ObjectMapper; import org.junit.Test; +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; + import junit.framework.Assert; /** @@ -69,7 +70,7 @@ public void testDeserializeHostInfo() throws JsonParseException, "\"memorytotal\": 3051356," + "\"netmask\": \"255.255.255.0\"}"; ObjectMapper mapper = new ObjectMapper(); - mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); HostInfo info = mapper.readValue(hostinfo, HostInfo.class); Assert.assertEquals(info.getMemoryTotal(), 3051356L); Assert.assertEquals(info.getKernel(), "Linux"); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelperTest.java index d7c0ae9b1ae..c92b131f607 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelperTest.java @@ -57,11 +57,11 @@ import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.internal.AmbariServerConfigurationHandler; import org.apache.ambari.server.state.ServiceInfo; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.node.JsonNodeFactory; import org.junit.Test; import org.mockito.Mockito; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.google.gson.Gson; /** diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommandTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommandTest.java index 52ae4248b7c..3d61e2b8dd9 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommandTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommandTest.java @@ -60,11 +60,6 @@ import org.apache.ambari.server.controller.internal.AmbariServerConfigurationHandler; import org.apache.ambari.server.state.ServiceInfo; import org.apache.commons.io.FileUtils; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.node.ArrayNode; -import org.codehaus.jackson.node.ObjectNode; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -73,6 +68,11 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.collect.Lists; /** @@ -229,7 +229,7 @@ public void testPopulateStackHierarchy() throws Exception { ArrayNode stackVersions = (ArrayNode) stackHierarchy.get("stack_versions"); assertNotNull(stackVersions); assertEquals(2, stackVersions.size()); - Iterator stackVersionsElements = stackVersions.getElements(); + Iterator stackVersionsElements = stackVersions.elements(); assertEquals("0.9", stackVersionsElements.next().asText()); assertEquals("0.8", stackVersionsElements.next().asText()); } @@ -253,7 +253,7 @@ public void testPopulateAmbariServerProperties() throws Exception { JsonNode serverProperties = objectNode.get("ambari-server-properties"); assertNotNull(serverProperties); - assertEquals("b", serverProperties.iterator().next().getTextValue()); + assertEquals("b", serverProperties.iterator().next().textValue()); } @Test diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogLevelQueryResponseTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogLevelQueryResponseTest.java index d2ef341fdf9..d1082a2b8fc 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogLevelQueryResponseTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogLevelQueryResponseTest.java @@ -23,13 +23,13 @@ import java.io.StringReader; import java.util.List; -import org.codehaus.jackson.map.AnnotationIntrospector; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.ObjectReader; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector; import org.junit.Test; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.AnnotationIntrospector; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; public class LogLevelQueryResponseTest { @@ -52,7 +52,7 @@ public void testBasicParsing() throws Exception { AnnotationIntrospector introspector = new JacksonAnnotationIntrospector(); mapper.setAnnotationIntrospector(introspector); - mapper.getSerializationConfig().setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); ObjectReader logLevelQueryResponseReader = diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogLineResultTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogLineResultTest.java index a6fdaafa7ca..a25b89dfdde 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogLineResultTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogLineResultTest.java @@ -24,13 +24,14 @@ import java.io.StringReader; -import org.codehaus.jackson.map.AnnotationIntrospector; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.ObjectReader; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector; import org.junit.Test; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.AnnotationIntrospector; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; + public class LogLineResultTest { private static final String TEST_JSON_DATA_SINGLE_ENTRY = @@ -74,7 +75,7 @@ public void testBasicParsing() throws Exception { AnnotationIntrospector introspector = new JacksonAnnotationIntrospector(); mapper.setAnnotationIntrospector(introspector); - mapper.getSerializationConfig().setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); ObjectReader logLineResultReader = diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogQueryResponseTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogQueryResponseTest.java index 1ef591ef4a4..91b3eda84f8 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogQueryResponseTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogQueryResponseTest.java @@ -24,13 +24,14 @@ import java.io.StringReader; import java.util.List; -import org.codehaus.jackson.map.AnnotationIntrospector; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.ObjectReader; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector; import org.junit.Test; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.AnnotationIntrospector; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; + public class LogQueryResponseTest { private static final String TEST_JSON_INPUT_TWO_LIST_ENTRIES = @@ -101,7 +102,7 @@ public void testBasicParsing() throws Exception { AnnotationIntrospector introspector = new JacksonAnnotationIntrospector(); mapper.setAnnotationIntrospector(introspector); - mapper.getSerializationConfig().setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); ObjectReader logQueryResponseReader = diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ThreadPoolEnabledPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ThreadPoolEnabledPropertyProviderTest.java index b908db502c6..92fdae1bb56 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ThreadPoolEnabledPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ThreadPoolEnabledPropertyProviderTest.java @@ -22,18 +22,19 @@ import java.util.List; import org.apache.ambari.server.controller.jmx.JMXMetricHolder; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.ObjectReader; import org.junit.Assert; import org.junit.Test; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; + public class ThreadPoolEnabledPropertyProviderTest { @Test public void testGetCacheKeyForException() throws Exception { ObjectMapper jmxObjectMapper = new ObjectMapper(); - jmxObjectMapper.configure(DeserializationConfig.Feature.USE_ANNOTATIONS, false); + jmxObjectMapper.configure(MapperFeature.USE_ANNOTATIONS, false); ObjectReader jmxObjectReader = jmxObjectMapper.reader(JMXMetricHolder.class); List exceptions = new ArrayList<>(); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelperTest.java index 45b18e30752..387da649d93 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelperTest.java @@ -32,14 +32,15 @@ import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; import org.apache.http.HttpStatus; import org.apache.http.client.utils.URIBuilder; -import org.codehaus.jackson.map.AnnotationIntrospector; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.ObjectWriter; -import org.codehaus.jackson.xc.JaxbAnnotationIntrospector; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; import org.junit.Test; +import com.fasterxml.jackson.databind.AnnotationIntrospector; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectWriter; +import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; + public class MetricsRequestHelperTest { @Test diff --git a/ambari-server/src/test/java/org/apache/ambari/server/hooks/users/UserHookServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/hooks/users/UserHookServiceTest.java index effe0784c63..95e59559445 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/hooks/users/UserHookServiceTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/hooks/users/UserHookServiceTest.java @@ -40,7 +40,6 @@ import org.apache.ambari.server.state.Config; import org.apache.ambari.server.state.SecurityType; import org.apache.ambari.server.state.svccomphost.ServiceComponentHostServerActionEvent; -import org.codehaus.jackson.map.ObjectMapper; import org.easymock.Capture; import org.easymock.EasyMock; import org.easymock.EasyMockRule; @@ -52,6 +51,7 @@ import org.junit.Rule; import org.junit.Test; +import com.fasterxml.jackson.databind.ObjectMapper; public class UserHookServiceTest extends EasyMockSupport { diff --git a/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleCommandOrderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleCommandOrderTest.java index 5b647e762dc..36a4df63182 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleCommandOrderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleCommandOrderTest.java @@ -52,14 +52,14 @@ import org.apache.ambari.server.state.cluster.ClusterImpl; import org.apache.ambari.server.state.svccomphost.ServiceComponentHostImpl; import org.apache.ambari.server.utils.CollectionPresentationUtils; -import org.codehaus.jackson.annotate.JsonAutoDetect; -import org.codehaus.jackson.annotate.JsonMethod; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; import org.junit.After; import org.junit.Before; import org.junit.Test; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.google.inject.Guice; import com.google.inject.Injector; @@ -359,7 +359,7 @@ public void testAddDependencies() throws IOException { rco.addDependencies(testData); - mapper.setVisibility(JsonMethod.ALL, JsonAutoDetect.Visibility.ANY); + mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); String dump = mapper.writeValueAsString(rco.getDependencies()); // Depends on hashing, string representation can be different diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerActionTest.java index f25565ca0cc..82fee058a71 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerActionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerActionTest.java @@ -34,7 +34,6 @@ import org.apache.ambari.server.hooks.users.UserHookParams; import org.apache.ambari.server.state.SecurityType; import org.apache.ambari.server.utils.ShellCommandUtil; -import org.codehaus.jackson.map.ObjectMapper; import org.easymock.Capture; import org.easymock.EasyMock; import org.easymock.EasyMockRule; @@ -48,6 +47,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Maps; /** diff --git a/ambari-server/src/test/java/org/apache/ambari/server/utils/StageUtilsTest.java b/ambari-server/src/test/java/org/apache/ambari/server/utils/StageUtilsTest.java index 341c6db0d51..4bd1b5a4b6f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/utils/StageUtilsTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/utils/StageUtilsTest.java @@ -64,13 +64,13 @@ import org.apache.ambari.server.state.ServiceComponentHost; import org.apache.ambari.server.testutils.PartialNiceMockBinder; import org.apache.ambari.server.topology.TopologyManager; -import org.codehaus.jackson.JsonGenerationException; -import org.codehaus.jackson.map.JsonMappingException; import org.easymock.EasyMockSupport; import org.easymock.IAnswer; import org.junit.Before; import org.junit.Test; +import com.fasterxml.jackson.core.JsonGenerationException; +import com.fasterxml.jackson.databind.JsonMappingException; import com.google.common.base.Predicate; import com.google.common.collect.ContiguousSet; import com.google.common.collect.DiscreteDomain; diff --git a/contrib/ambari-log4j/src/main/java/org/apache/ambari/log4j/hadoop/mapreduce/jobhistory/MapReduceJobHistoryUpdater.java b/contrib/ambari-log4j/src/main/java/org/apache/ambari/log4j/hadoop/mapreduce/jobhistory/MapReduceJobHistoryUpdater.java index d62494bbb29..bb15afbfda8 100644 --- a/contrib/ambari-log4j/src/main/java/org/apache/ambari/log4j/hadoop/mapreduce/jobhistory/MapReduceJobHistoryUpdater.java +++ b/contrib/ambari-log4j/src/main/java/org/apache/ambari/log4j/hadoop/mapreduce/jobhistory/MapReduceJobHistoryUpdater.java @@ -62,7 +62,7 @@ import org.apache.hadoop.tools.rumen.TaskStartedEvent; import org.apache.hadoop.util.StringUtils; import org.apache.log4j.spi.LoggingEvent; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; public class MapReduceJobHistoryUpdater implements LogStoreUpdateProvider { diff --git a/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/utilities/SCOMMetricHelper.java b/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/utilities/SCOMMetricHelper.java index ee1210fc9ae..9a189b58cb4 100644 --- a/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/utilities/SCOMMetricHelper.java +++ b/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/utilities/SCOMMetricHelper.java @@ -19,8 +19,8 @@ import org.apache.ambari.server.controller.internal.PropertyInfo; import org.apache.ambari.server.controller.spi.Resource; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.type.TypeReference; import java.io.IOException; import java.util.HashMap;