@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
was deprecated
use @JsonInclude(Include.NON_NULL) instead
to suppress when property is NULL
Issue-ID: APPC-1764
Change-Id: I1bbe10a156166bc37a167122ff68d1dc183fcd2f
Signed-off-by: Taka Cho <takamune.cho@att.com>
20 files changed:
package org.onap.appc.adapter.message.event;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
package org.onap.appc.adapter.message.event;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize.Inclusion;
-
import java.io.IOException;
import java.io.Serializable;
import java.io.IOException;
import java.io.Serializable;
-
-@JsonSerialize(include = Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class EventMessage implements Serializable {
@JsonIgnoreProperties(ignoreUnknown = true)
public class EventMessage implements Serializable {
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
* note the structure of this class must be adapted to the sync message sent to DMaaP represened in org.onap.appc.listener.LCM.domainmodel.DmaapOutgoingMessage
*
*/
* note the structure of this class must be adapted to the sync message sent to DMaaP represened in org.onap.appc.listener.LCM.domainmodel.DmaapOutgoingMessage
*
*/
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class DmaapOutgoingMessage {
@JsonIgnoreProperties(ignoreUnknown = true)
public class DmaapOutgoingMessage {
- @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+ @JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public static class Body {
public Body() {
@JsonIgnoreProperties(ignoreUnknown = true)
public static class Body {
public Body() {
package org.onap.appc.validationpolicy.objects;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
package org.onap.appc.validationpolicy.objects;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class ValidationJSON {
@JsonIgnoreProperties(ignoreUnknown = true)
public class ValidationJSON {
package org.onap.appc.listener.LCM.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
package org.onap.appc.listener.LCM.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import org.json.JSONObject;
-import org.onap.appc.listener.util.Mapper;
+import com.fasterxml.jackson.annotation.JsonInclude;
/**
* This class represents a message being sent out to DMaaP by APPC to update listeners on the status of a request
*
*/
/**
* This class represents a message being sent out to DMaaP by APPC to update listeners on the status of a request
*
*/
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class DmaapIncomingMessage extends DmaapMessage{
private final static String defaultCambriaPartition = "APP-C";
@JsonIgnoreProperties(ignoreUnknown = true)
public class DmaapIncomingMessage extends DmaapMessage{
private final static String defaultCambriaPartition = "APP-C";
package org.onap.appc.listener.LCM.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
package org.onap.appc.listener.LCM.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class DmaapMessage {
@JsonIgnoreProperties(ignoreUnknown = true)
public class DmaapMessage {
package org.onap.appc.listener.LCM.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
package org.onap.appc.listener.LCM.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import org.json.JSONObject;
-import org.onap.appc.listener.util.Mapper;
+import com.fasterxml.jackson.annotation.JsonInclude;
/**
* This class represents a message being sent out to DMaaP by APPC to update listeners on the status of a request
*
*/
/**
* This class represents a message being sent out to DMaaP by APPC to update listeners on the status of a request
*
*/
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class DmaapOutgoingMessage extends DmaapMessage{
private final static String defaultCambriaPartition = "MSO";
@JsonIgnoreProperties(ignoreUnknown = true)
public class DmaapOutgoingMessage extends DmaapMessage{
private final static String defaultCambriaPartition = "MSO";
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class InputBody {
@JsonIgnoreProperties(ignoreUnknown = true)
public class InputBody {
package org.onap.appc.listener.LCM.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
package org.onap.appc.listener.LCM.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.json.JSONObject;
import org.onap.appc.listener.util.Mapper;
/**
* This class represents a message being sent out to DMaaP by APPC to update listeners on the status of a request
*/
import org.json.JSONObject;
import org.onap.appc.listener.util.Mapper;
/**
* This class represents a message being sent out to DMaaP by APPC to update listeners on the status of a request
*/
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class OutputBody {
@JsonIgnoreProperties(ignoreUnknown = true)
public class OutputBody {
package org.onap.appc.listener.LCM.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
package org.onap.appc.listener.LCM.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class ResponseStatus {
@JsonIgnoreProperties(ignoreUnknown = true)
public class ResponseStatus {
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize.Inclusion;
/**
* This class holds attributes that are common to DMaaP messages both coming in from DCAE and being sent out by APPC
*
*/
/**
* This class holds attributes that are common to DMaaP messages both coming in from DCAE and being sent out by APPC
*
*/
-@JsonSerialize(include = Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+
@JsonIgnoreProperties(ignoreUnknown = true)
public class CommonMessage implements Serializable {
/*
@JsonIgnoreProperties(ignoreUnknown = true)
public class CommonMessage implements Serializable {
/*
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize.Inclusion;
/**
* This class represents a message coming in from DCAE.
*
*/
/**
* This class represents a message coming in from DCAE.
*
*/
-@JsonSerialize(include = Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class IncomingMessage extends CommonMessage {
@JsonIgnoreProperties(ignoreUnknown = true)
public class IncomingMessage extends CommonMessage {
import org.onap.appc.util.Time;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.onap.appc.util.Time;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize.Inclusion;
/**
* This class represents a message being sent out to DMaaP by APPC to update listeners on the status of a request
*
*/
/**
* This class represents a message being sent out to DMaaP by APPC to update listeners on the status of a request
*
*/
-@JsonSerialize(include = Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class OutgoingMessage extends CommonMessage {
@JsonIgnoreProperties(ignoreUnknown = true)
public class OutgoingMessage extends CommonMessage {
package org.onap.appc.oam.messageadapter;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
package org.onap.appc.oam.messageadapter;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
/**
* This class represents a message being sent out to DMaaP by APPC as async response.
* note the structure of this class must be adapted to the sync message sent to DMaaP represented in org.onap.appc.listener.LCM.domainmodel.DmaapOutgoingMessage
*
*/
/**
* This class represents a message being sent out to DMaaP by APPC as async response.
* note the structure of this class must be adapted to the sync message sent to DMaaP represented in org.onap.appc.listener.LCM.domainmodel.DmaapOutgoingMessage
*
*/
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class DmaapOutgoingMessage {
@JsonIgnoreProperties(ignoreUnknown = true)
public class DmaapOutgoingMessage {
", body=" + body +
'}';
}
", body=" + body +
'}';
}
-
- @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+ @JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public static class Body {
public Body() {
@JsonIgnoreProperties(ignoreUnknown = true)
public static class Body {
public Body() {
package org.onap.appc.sdc.artifacts.object;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
package org.onap.appc.sdc.artifacts.object;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonPropertyOrder({"vnfc-type","mandatory","resilience","parents"})
public class Vnfc {
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonPropertyOrder({"vnfc-type","mandatory","resilience","parents"})
public class Vnfc {
package org.onap.appc.seqgen.objects;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
package org.onap.appc.seqgen.objects;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class ActionIdentifier {
@JsonIgnoreProperties(ignoreUnknown = true)
public class ActionIdentifier {
package org.onap.appc.seqgen.objects;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
package org.onap.appc.seqgen.objects;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class PreCheckOption {
@JsonIgnoreProperties(ignoreUnknown = true)
public class PreCheckOption {
package org.onap.appc.seqgen.objects;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
package org.onap.appc.seqgen.objects;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class RequestInfo {
@JsonIgnoreProperties(ignoreUnknown = true)
public class RequestInfo {
package org.onap.appc.seqgen.objects;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
package org.onap.appc.seqgen.objects;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class Response {
@JsonIgnoreProperties(ignoreUnknown = true)
public class Response {
package org.onap.appc.seqgen.objects;
package org.onap.appc.seqgen.objects;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.onap.appc.dg.objects.InventoryModel;
import org.onap.appc.dg.objects.VnfcDependencyModel;
import javax.validation.constraints.NotNull;
import java.util.Map;
import org.onap.appc.dg.objects.InventoryModel;
import org.onap.appc.dg.objects.VnfcDependencyModel;
import javax.validation.constraints.NotNull;
import java.util.Map;
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class SequenceGeneratorInput {
@JsonIgnoreProperties(ignoreUnknown = true)
public class SequenceGeneratorInput {
package org.onap.appc.seqgen.objects;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
package org.onap.appc.seqgen.objects;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class Transaction {
@JsonIgnoreProperties(ignoreUnknown = true)
public class Transaction {