diff --git a/WebContent/META-INF/MANIFEST.MF b/WebContent/META-INF/MANIFEST.MF deleted file mode 100644 index 254272e..0000000 --- a/WebContent/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/WebContent/WEB-INF/beans.xml b/WebContent/WEB-INF/beans.xml deleted file mode 100644 index e90e3cc..0000000 --- a/WebContent/WEB-INF/beans.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/java/br/gov/ans/exceptions/ErrorMessage.java b/src/main/java/br/gov/ans/exceptions/ErrorMessage.java index 587b157..dd09943 100644 --- a/src/main/java/br/gov/ans/exceptions/ErrorMessage.java +++ b/src/main/java/br/gov/ans/exceptions/ErrorMessage.java @@ -2,6 +2,11 @@ package br.gov.ans.exceptions; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class ErrorMessage { private String error; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Andamento.java b/src/main/java/br/gov/ans/integracao/sei/client/Andamento.java index 5d9b532..d0edd2a 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Andamento.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Andamento.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Andamento implements java.io.Serializable { private java.lang.String idAndamento; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/AndamentoMarcador.java b/src/main/java/br/gov/ans/integracao/sei/client/AndamentoMarcador.java index dd0ac17..0e1a8fe 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/AndamentoMarcador.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/AndamentoMarcador.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class AndamentoMarcador implements java.io.Serializable { private java.lang.String idAndamentoMarcador; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/ArquivoExtensao.java b/src/main/java/br/gov/ans/integracao/sei/client/ArquivoExtensao.java index d51b10d..0f08f94 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/ArquivoExtensao.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/ArquivoExtensao.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class ArquivoExtensao implements java.io.Serializable { private java.lang.String idArquivoExtensao; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Assinatura.java b/src/main/java/br/gov/ans/integracao/sei/client/Assinatura.java index 168f83a..00dc7c9 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Assinatura.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Assinatura.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Assinatura implements java.io.Serializable { private java.lang.String nome; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Assunto.java b/src/main/java/br/gov/ans/integracao/sei/client/Assunto.java index 21025c7..ee52cf9 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Assunto.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Assunto.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Assunto implements java.io.Serializable { private java.lang.String codigoEstruturado; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/AtributoAndamento.java b/src/main/java/br/gov/ans/integracao/sei/client/AtributoAndamento.java index 99b5cc2..d7f936c 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/AtributoAndamento.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/AtributoAndamento.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class AtributoAndamento implements java.io.Serializable { private java.lang.String nome; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Campo.java b/src/main/java/br/gov/ans/integracao/sei/client/Campo.java index 7903e82..0f116d4 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Campo.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Campo.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Campo implements java.io.Serializable { private java.lang.String nome; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Cargo.java b/src/main/java/br/gov/ans/integracao/sei/client/Cargo.java index b5d6e35..e50ae19 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Cargo.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Cargo.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Cargo implements java.io.Serializable { private java.lang.String idCargo; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Cidade.java b/src/main/java/br/gov/ans/integracao/sei/client/Cidade.java index 1086b03..54821c5 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Cidade.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Cidade.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Cidade implements java.io.Serializable { private java.lang.String idCidade; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Contato.java b/src/main/java/br/gov/ans/integracao/sei/client/Contato.java index b0f6237..6cf44d6 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Contato.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Contato.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Contato implements java.io.Serializable { private java.lang.String staOperacao; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/DefinicaoMarcador.java b/src/main/java/br/gov/ans/integracao/sei/client/DefinicaoMarcador.java index 129bc51..28b4e58 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/DefinicaoMarcador.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/DefinicaoMarcador.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class DefinicaoMarcador implements java.io.Serializable { private java.lang.String protocoloProcedimento; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Destinatario.java b/src/main/java/br/gov/ans/integracao/sei/client/Destinatario.java index d6f87df..45b18c9 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Destinatario.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Destinatario.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Destinatario implements java.io.Serializable { private java.lang.String sigla; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Documento.java b/src/main/java/br/gov/ans/integracao/sei/client/Documento.java index 9f5f877..202b63d 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Documento.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Documento.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Documento implements java.io.Serializable { private java.lang.String tipo; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Estado.java b/src/main/java/br/gov/ans/integracao/sei/client/Estado.java index 825501a..2095350 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Estado.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Estado.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Estado implements java.io.Serializable { private java.lang.String idEstado; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/HipoteseLegal.java b/src/main/java/br/gov/ans/integracao/sei/client/HipoteseLegal.java index 94550ae..42ce80a 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/HipoteseLegal.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/HipoteseLegal.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class HipoteseLegal implements java.io.Serializable { private java.lang.String idHipoteseLegal; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Interessado.java b/src/main/java/br/gov/ans/integracao/sei/client/Interessado.java index f8d12c8..8ac2d62 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Interessado.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Interessado.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Interessado implements java.io.Serializable { private java.lang.String sigla; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Marcador.java b/src/main/java/br/gov/ans/integracao/sei/client/Marcador.java index 3fca6f2..c4619df 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Marcador.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Marcador.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Marcador implements java.io.Serializable { private java.lang.String idMarcador; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Observacao.java b/src/main/java/br/gov/ans/integracao/sei/client/Observacao.java index 90c8229..4d30574 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Observacao.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Observacao.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Observacao implements java.io.Serializable { private java.lang.String descricao; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Pais.java b/src/main/java/br/gov/ans/integracao/sei/client/Pais.java index 2d39c60..1dd2188 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Pais.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Pais.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Pais implements java.io.Serializable { private java.lang.String idPais; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Procedimento.java b/src/main/java/br/gov/ans/integracao/sei/client/Procedimento.java index c4a4474..f724e19 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Procedimento.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Procedimento.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Procedimento implements java.io.Serializable { private java.lang.String idTipoProcedimento; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/ProcedimentoResumido.java b/src/main/java/br/gov/ans/integracao/sei/client/ProcedimentoResumido.java index 1934cb2..539ad77 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/ProcedimentoResumido.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/ProcedimentoResumido.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class ProcedimentoResumido implements java.io.Serializable { private java.lang.String idProcedimento; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/ProtocoloBloco.java b/src/main/java/br/gov/ans/integracao/sei/client/ProtocoloBloco.java index c473d9a..6c3f5a2 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/ProtocoloBloco.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/ProtocoloBloco.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class ProtocoloBloco implements java.io.Serializable { private java.lang.String protocoloFormatado; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Publicacao.java b/src/main/java/br/gov/ans/integracao/sei/client/Publicacao.java index 4d0446b..9e5d518 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Publicacao.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Publicacao.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Publicacao implements java.io.Serializable { private java.lang.String nomeVeiculo; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/PublicacaoImprensaNacional.java b/src/main/java/br/gov/ans/integracao/sei/client/PublicacaoImprensaNacional.java index ee45b1a..6f3ae90 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/PublicacaoImprensaNacional.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/PublicacaoImprensaNacional.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class PublicacaoImprensaNacional implements java.io.Serializable { private java.lang.String siglaVeiculo; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Remetente.java b/src/main/java/br/gov/ans/integracao/sei/client/Remetente.java index 9063280..9beea09 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Remetente.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Remetente.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Remetente implements java.io.Serializable { private java.lang.String sigla; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/RetornoConsultaBloco.java b/src/main/java/br/gov/ans/integracao/sei/client/RetornoConsultaBloco.java index 46fb98c..4906b92 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/RetornoConsultaBloco.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/RetornoConsultaBloco.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class RetornoConsultaBloco implements java.io.Serializable { private java.lang.String idBloco; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/RetornoConsultaDocumento.java b/src/main/java/br/gov/ans/integracao/sei/client/RetornoConsultaDocumento.java index ed75e84..9178d92 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/RetornoConsultaDocumento.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/RetornoConsultaDocumento.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class RetornoConsultaDocumento implements java.io.Serializable { private java.lang.String idProcedimento; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/RetornoConsultaProcedimento.java b/src/main/java/br/gov/ans/integracao/sei/client/RetornoConsultaProcedimento.java index 19d381c..eeea078 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/RetornoConsultaProcedimento.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/RetornoConsultaProcedimento.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class RetornoConsultaProcedimento implements java.io.Serializable { private java.lang.String idProcedimento; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/RetornoGeracaoProcedimento.java b/src/main/java/br/gov/ans/integracao/sei/client/RetornoGeracaoProcedimento.java index 37ef256..7a094db 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/RetornoGeracaoProcedimento.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/RetornoGeracaoProcedimento.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class RetornoGeracaoProcedimento implements java.io.Serializable { private java.lang.String idProcedimento; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/RetornoInclusaoDocumento.java b/src/main/java/br/gov/ans/integracao/sei/client/RetornoInclusaoDocumento.java index ae1d2f9..dea06e6 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/RetornoInclusaoDocumento.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/RetornoInclusaoDocumento.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class RetornoInclusaoDocumento implements java.io.Serializable { private java.lang.String idDocumento; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Serie.java b/src/main/java/br/gov/ans/integracao/sei/client/Serie.java index 3337717..730ba7d 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Serie.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Serie.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Serie implements java.io.Serializable { private java.lang.String idSerie; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/TipoConferencia.java b/src/main/java/br/gov/ans/integracao/sei/client/TipoConferencia.java index fc914c4..dc63161 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/TipoConferencia.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/TipoConferencia.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class TipoConferencia implements java.io.Serializable { private java.lang.String idTipoConferencia; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/TipoProcedimento.java b/src/main/java/br/gov/ans/integracao/sei/client/TipoProcedimento.java index f36a155..907d6d7 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/TipoProcedimento.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/TipoProcedimento.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class TipoProcedimento implements java.io.Serializable { private java.lang.String idTipoProcedimento; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Unidade.java b/src/main/java/br/gov/ans/integracao/sei/client/Unidade.java index 067ce23..8f1301a 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Unidade.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Unidade.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Unidade implements java.io.Serializable { private java.lang.String idUnidade; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/UnidadeProcedimentoAberto.java b/src/main/java/br/gov/ans/integracao/sei/client/UnidadeProcedimentoAberto.java index b57af00..8225eff 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/UnidadeProcedimentoAberto.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/UnidadeProcedimentoAberto.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class UnidadeProcedimentoAberto implements java.io.Serializable { private br.gov.ans.integracao.sei.client.Unidade unidade; diff --git a/src/main/java/br/gov/ans/integracao/sei/client/Usuario.java b/src/main/java/br/gov/ans/integracao/sei/client/Usuario.java index b101962..b2c8060 100644 --- a/src/main/java/br/gov/ans/integracao/sei/client/Usuario.java +++ b/src/main/java/br/gov/ans/integracao/sei/client/Usuario.java @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Usuario implements java.io.Serializable { private java.lang.String idUsuario; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/Arquivo.java b/src/main/java/br/gov/ans/integracao/sei/modelo/Arquivo.java index c3dae91..716e639 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/Arquivo.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/Arquivo.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Arquivo { diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/ArquivoCriado.java b/src/main/java/br/gov/ans/integracao/sei/modelo/ArquivoCriado.java index 309b2ef..54d7e48 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/ArquivoCriado.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/ArquivoCriado.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class ArquivoCriado { private String identificador; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/AtribuicaoProcesso.java b/src/main/java/br/gov/ans/integracao/sei/modelo/AtribuicaoProcesso.java index 9eadd60..f7313df 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/AtribuicaoProcesso.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/AtribuicaoProcesso.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class AtribuicaoProcesso { diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/CancelamentoDocumento.java b/src/main/java/br/gov/ans/integracao/sei/modelo/CancelamentoDocumento.java index afe3541..b43c979 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/CancelamentoDocumento.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/CancelamentoDocumento.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class CancelamentoDocumento { private String documento; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/Cidade.java b/src/main/java/br/gov/ans/integracao/sei/modelo/Cidade.java index 2ac7406..d985b0b 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/Cidade.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/Cidade.java @@ -12,7 +12,11 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; import org.codehaus.jackson.annotate.JsonIgnore; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement @Entity @Table(name="cidade") diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/Contato.java b/src/main/java/br/gov/ans/integracao/sei/modelo/Contato.java index cd7bef8..992f1b3 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/Contato.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/Contato.java @@ -9,6 +9,11 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.Table; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @Entity @Table(name="contato") @NamedQueries({@NamedQuery(name="Contato.pesquisarPorID", query="select c from Contato c where c.id = :id"), diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/DocumentoResumido.java b/src/main/java/br/gov/ans/integracao/sei/modelo/DocumentoResumido.java index ccdf209..19c7e86 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/DocumentoResumido.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/DocumentoResumido.java @@ -10,6 +10,7 @@ import javax.persistence.OneToOne; import javax.persistence.SqlResultSetMapping; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; import org.codehaus.jackson.map.annotate.JsonSerialize; @XmlRootElement @@ -31,7 +32,8 @@ import org.codehaus.jackson.map.annotate.JsonSerialize; @FieldResult(name = "codigo", column = "tipoCodigo"), @FieldResult(name = "nome", column = "tipoNome")}) }) -@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) public class DocumentoResumido { @Id private String numero; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/Endereco.java b/src/main/java/br/gov/ans/integracao/sei/modelo/Endereco.java index 324cdae..f6dceb8 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/Endereco.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/Endereco.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Endereco { private String logradouro; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/EnvioDeProcesso.java b/src/main/java/br/gov/ans/integracao/sei/modelo/EnvioDeProcesso.java index e304a68..cefc736 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/EnvioDeProcesso.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/EnvioDeProcesso.java @@ -4,6 +4,11 @@ import java.util.Date; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class EnvioDeProcesso { private String numeroDoProcesso; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/Estado.java b/src/main/java/br/gov/ans/integracao/sei/modelo/Estado.java index d62cd78..bac41a9 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/Estado.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/Estado.java @@ -8,7 +8,11 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; import org.codehaus.jackson.annotate.JsonIgnore; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement @Entity @Table(name = "uf") diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/ExclusaoDocumento.java b/src/main/java/br/gov/ans/integracao/sei/modelo/ExclusaoDocumento.java index 2a85a98..69ad5c7 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/ExclusaoDocumento.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/ExclusaoDocumento.java @@ -15,7 +15,11 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; import org.codehaus.jackson.annotate.JsonIgnore; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement @Entity @Table(schema = "ANS_GERAL", name = "TB_EXCLUSAO_DOCUMENTO_BROKER") diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/InclusaoDocumento.java b/src/main/java/br/gov/ans/integracao/sei/modelo/InclusaoDocumento.java index 502e31b..e8f971c 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/InclusaoDocumento.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/InclusaoDocumento.java @@ -15,9 +15,13 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; import org.codehaus.jackson.annotate.JsonIgnore; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; import br.gov.ans.integracao.sei.client.Documento; +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement @Entity @Table(schema="ANS_GERAL",name="TB_INCLUSAO_DOCUMENTO_BROKER") diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/InclusaoDocumentoBloco.java b/src/main/java/br/gov/ans/integracao/sei/modelo/InclusaoDocumentoBloco.java index cfa03f0..2366a06 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/InclusaoDocumentoBloco.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/InclusaoDocumentoBloco.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class InclusaoDocumentoBloco { private String bloco; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/InclusaoProcessoBloco.java b/src/main/java/br/gov/ans/integracao/sei/modelo/InclusaoProcessoBloco.java index fa7445c..30cfcad 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/InclusaoProcessoBloco.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/InclusaoProcessoBloco.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class InclusaoProcessoBloco { private String bloco; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/MarcacaoProcesso.java b/src/main/java/br/gov/ans/integracao/sei/modelo/MarcacaoProcesso.java index bef6a20..a2cc156 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/MarcacaoProcesso.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/MarcacaoProcesso.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class MarcacaoProcesso { diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/Motivo.java b/src/main/java/br/gov/ans/integracao/sei/modelo/Motivo.java index 83ebbc8..a0ef012 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/Motivo.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/Motivo.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Motivo { String motivo; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/NovoAndamento.java b/src/main/java/br/gov/ans/integracao/sei/modelo/NovoAndamento.java index 05610c8..a17ae0e 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/NovoAndamento.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/NovoAndamento.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import java.util.HashMap; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) public class NovoAndamento { private String tarefa; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/NovoBloco.java b/src/main/java/br/gov/ans/integracao/sei/modelo/NovoBloco.java index c855bdd..17b94dc 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/NovoBloco.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/NovoBloco.java @@ -3,10 +3,12 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; import br.gov.ans.integracao.sei.modelo.enums.TipoBloco; @XmlRootElement +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class NovoBloco { diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/NovoProcesso.java b/src/main/java/br/gov/ans/integracao/sei/modelo/NovoProcesso.java index 4579633..bcd23b8 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/NovoProcesso.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/NovoProcesso.java @@ -4,9 +4,14 @@ import java.util.Date; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + import br.gov.ans.integracao.sei.client.Documento; import br.gov.ans.integracao.sei.client.Procedimento; +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class NovoProcesso { private Procedimento dadosProcesso; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/ParteArquivo.java b/src/main/java/br/gov/ans/integracao/sei/modelo/ParteArquivo.java index 6d91839..67af616 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/ParteArquivo.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/ParteArquivo.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class ParteArquivo { private String arquivo; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/Pessoa.java b/src/main/java/br/gov/ans/integracao/sei/modelo/Pessoa.java index cf7cb42..28c9305 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/Pessoa.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/Pessoa.java @@ -5,7 +5,9 @@ import javax.xml.bind.annotation.XmlRootElement; import org.codehaus.jackson.annotate.JsonIgnoreProperties; import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; +import org.codehaus.jackson.map.annotate.JsonSerialize; +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY) @JsonSubTypes({ diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/PessoaFisica.java b/src/main/java/br/gov/ans/integracao/sei/modelo/PessoaFisica.java index b4e4caa..4cccec2 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/PessoaFisica.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/PessoaFisica.java @@ -4,8 +4,13 @@ import java.util.Date; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + import br.gov.ans.integracao.sei.modelo.enums.Sexo; +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class PessoaFisica extends Pessoa { private Sexo sexo; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/PessoaJuridica.java b/src/main/java/br/gov/ans/integracao/sei/modelo/PessoaJuridica.java index 757b6f8..3b74c63 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/PessoaJuridica.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/PessoaJuridica.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class PessoaJuridica extends Pessoa { private String cnpj; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoAnexado.java b/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoAnexado.java index 2ad33eb..0125937 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoAnexado.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoAnexado.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class ProcessoAnexado { private String numero; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoBloqueado.java b/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoBloqueado.java index e501b4c..e8461a8 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoBloqueado.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoBloqueado.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class ProcessoBloqueado { private String numero; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoRelacionado.java b/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoRelacionado.java index f2b240c..0f066e2 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoRelacionado.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoRelacionado.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class ProcessoRelacionado { private String numero; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoResumido.java b/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoResumido.java index 090fd21..79467ba 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoResumido.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoResumido.java @@ -10,6 +10,7 @@ import javax.persistence.OneToOne; import javax.persistence.SqlResultSetMapping; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; import org.codehaus.jackson.map.annotate.JsonSerialize; @XmlRootElement @@ -28,7 +29,8 @@ import org.codehaus.jackson.map.annotate.JsonSerialize; @FieldResult(name = "codigo", column = "tipoCodigo"), @FieldResult(name = "nome", column = "tipoNome")}) }) -@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) public class ProcessoResumido { @Id diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/ResultadoConsultaDocumento.java b/src/main/java/br/gov/ans/integracao/sei/modelo/ResultadoConsultaDocumento.java index d299234..752f1e3 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/ResultadoConsultaDocumento.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/ResultadoConsultaDocumento.java @@ -2,9 +2,14 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + import br.gov.ans.integracao.sei.client.RetornoConsultaDocumento; import br.gov.ans.integracao.sipar.dao.DocumentoSipar; +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class ResultadoConsultaDocumento { diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/ResultadoConsultaProcesso.java b/src/main/java/br/gov/ans/integracao/sei/modelo/ResultadoConsultaProcesso.java index 3f323fd..b3d36d4 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/ResultadoConsultaProcesso.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/ResultadoConsultaProcesso.java @@ -2,9 +2,14 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + import br.gov.ans.integracao.sei.client.RetornoConsultaProcedimento; import br.gov.ans.integracao.sipar.dao.DocumentoSipar; +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class ResultadoConsultaProcesso { diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/ResultadoInclusaoDocumento.java b/src/main/java/br/gov/ans/integracao/sei/modelo/ResultadoInclusaoDocumento.java index 9084c7b..fc25a0f 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/ResultadoInclusaoDocumento.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/ResultadoInclusaoDocumento.java @@ -2,8 +2,13 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + import br.gov.ans.integracao.sei.client.RetornoInclusaoDocumento; +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class ResultadoInclusaoDocumento { private RetornoInclusaoDocumento retorno; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/SobrestamentoProcesso.java b/src/main/java/br/gov/ans/integracao/sei/modelo/SobrestamentoProcesso.java index 88890db..c9e97c2 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/SobrestamentoProcesso.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/SobrestamentoProcesso.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class SobrestamentoProcesso { private String processo; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/Tarefa.java b/src/main/java/br/gov/ans/integracao/sei/modelo/Tarefa.java index ae8aec0..5828db0 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/Tarefa.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/Tarefa.java @@ -8,6 +8,11 @@ import javax.persistence.NamedQuery; import javax.persistence.Table; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement @Entity @Table(name="tarefa") diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/Template.java b/src/main/java/br/gov/ans/integracao/sei/modelo/Template.java index e83ceb8..c8c1847 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/Template.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/Template.java @@ -4,6 +4,11 @@ import java.util.Date; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Template { private String nome; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/Tipo.java b/src/main/java/br/gov/ans/integracao/sei/modelo/Tipo.java index 6ac765f..1f62deb 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/Tipo.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/Tipo.java @@ -1,12 +1,14 @@ package br.gov.ans.integracao.sei.modelo; import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; import javax.persistence.Id; -import javax.persistence.SqlResultSetMapping; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @Entity //@SqlResultSetMapping(name = "TipoMapping", entities = { @EntityResult(entityClass = Tipo.class, fields = { // @FieldResult(name = "codigo", column = "tipoCodigo"), @FieldResult(name = "nome", column = "tipoNome") }) }) diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/TipoContato.java b/src/main/java/br/gov/ans/integracao/sei/modelo/TipoContato.java index 2f034e1..0b397f4 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/TipoContato.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/TipoContato.java @@ -8,6 +8,11 @@ import javax.persistence.NamedQuery; import javax.persistence.Table; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement @Entity @Table(name="tipo_contato") diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/TipoDocumento.java b/src/main/java/br/gov/ans/integracao/sei/modelo/TipoDocumento.java index 0f13b97..f6ba66e 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/TipoDocumento.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/TipoDocumento.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class TipoDocumento { private String identificador; diff --git a/src/main/java/br/gov/ans/integracao/sei/modelo/Usuario.java b/src/main/java/br/gov/ans/integracao/sei/modelo/Usuario.java index 39b9eb5..967602d 100644 --- a/src/main/java/br/gov/ans/integracao/sei/modelo/Usuario.java +++ b/src/main/java/br/gov/ans/integracao/sei/modelo/Usuario.java @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement public class Usuario { private String codigo; diff --git a/src/main/java/br/gov/ans/integracao/templates/client/ClientTemplatesBroker.java b/src/main/java/br/gov/ans/integracao/templates/client/ClientTemplatesBroker.java index 60e7da0..e8d1530 100644 --- a/src/main/java/br/gov/ans/integracao/templates/client/ClientTemplatesBroker.java +++ b/src/main/java/br/gov/ans/integracao/templates/client/ClientTemplatesBroker.java @@ -5,7 +5,6 @@ import javax.ws.rs.ProcessingException; import javax.ws.rs.client.Client; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.Response.Status.Family; import org.jboss.logging.Logger; diff --git a/src/main/java/br/gov/ans/modelo/LogIntegracaoSistemica.java b/src/main/java/br/gov/ans/modelo/LogIntegracaoSistemica.java index ef9b03d..3556294 100644 --- a/src/main/java/br/gov/ans/modelo/LogIntegracaoSistemica.java +++ b/src/main/java/br/gov/ans/modelo/LogIntegracaoSistemica.java @@ -15,6 +15,11 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.xml.bind.annotation.XmlRootElement; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) @XmlRootElement @Entity @Table(schema="ANS_GERAL",name="TB_LOG_INTEGRACAO_SISTEMICA") diff --git a/src/test/java/br/gov/ans/integracao/sei/testes/FunctionalTest.java b/src/test/java/br/gov/ans/integracao/sei/testes/FunctionalTest.java index 2645ac5..b13ae15 100644 --- a/src/test/java/br/gov/ans/integracao/sei/testes/FunctionalTest.java +++ b/src/test/java/br/gov/ans/integracao/sei/testes/FunctionalTest.java @@ -6,8 +6,8 @@ import com.jayway.restassured.RestAssured; public class FunctionalTest { - protected final String USUARIO = "andre.guimaraes"; - protected final String SENHA = "*****"; + protected final String USUARIO = "desenv_integracao_sei"; + protected final String SENHA = "integra_sei_2016"; protected static final Boolean DESENVOLVIMENTO = true; @BeforeClass -- libgit2 0.21.2