Commit 50940266ed2754126eab07f02811ea3f656f30cb
1 parent
938f55a3
Exists in
master
and in
1 other branch
Melhora o parse JSon dos objetos
O parse para JSon para ignorar atributos desconhecidos e não exibe atributos nulos.
Showing
79 changed files
with
363 additions
and
20 deletions
Show diff stats
WebContent/META-INF/MANIFEST.MF
WebContent/WEB-INF/beans.xml
| @@ -1,9 +0,0 @@ | @@ -1,9 +0,0 @@ | ||
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | -<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" | ||
| 3 | - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| 4 | - xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" | ||
| 5 | - version="1.1" bean-discovery-mode="annotated"> | ||
| 6 | - | ||
| 7 | - | ||
| 8 | - | ||
| 9 | -</beans> | ||
| 10 | \ No newline at end of file | 0 | \ No newline at end of file |
src/main/java/br/gov/ans/exceptions/ErrorMessage.java
| @@ -2,6 +2,11 @@ package br.gov.ans.exceptions; | @@ -2,6 +2,11 @@ package br.gov.ans.exceptions; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class ErrorMessage { | 11 | public class ErrorMessage { |
| 7 | private String error; | 12 | private String error; |
src/main/java/br/gov/ans/integracao/sei/client/Andamento.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Andamento implements java.io.Serializable { | 18 | public class Andamento implements java.io.Serializable { |
| 14 | private java.lang.String idAndamento; | 19 | private java.lang.String idAndamento; |
src/main/java/br/gov/ans/integracao/sei/client/AndamentoMarcador.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class AndamentoMarcador implements java.io.Serializable { | 18 | public class AndamentoMarcador implements java.io.Serializable { |
| 14 | private java.lang.String idAndamentoMarcador; | 19 | private java.lang.String idAndamentoMarcador; |
src/main/java/br/gov/ans/integracao/sei/client/ArquivoExtensao.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class ArquivoExtensao implements java.io.Serializable { | 18 | public class ArquivoExtensao implements java.io.Serializable { |
| 14 | private java.lang.String idArquivoExtensao; | 19 | private java.lang.String idArquivoExtensao; |
src/main/java/br/gov/ans/integracao/sei/client/Assinatura.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Assinatura implements java.io.Serializable { | 18 | public class Assinatura implements java.io.Serializable { |
| 14 | private java.lang.String nome; | 19 | private java.lang.String nome; |
src/main/java/br/gov/ans/integracao/sei/client/Assunto.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Assunto implements java.io.Serializable { | 18 | public class Assunto implements java.io.Serializable { |
| 14 | private java.lang.String codigoEstruturado; | 19 | private java.lang.String codigoEstruturado; |
src/main/java/br/gov/ans/integracao/sei/client/AtributoAndamento.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class AtributoAndamento implements java.io.Serializable { | 18 | public class AtributoAndamento implements java.io.Serializable { |
| 14 | private java.lang.String nome; | 19 | private java.lang.String nome; |
src/main/java/br/gov/ans/integracao/sei/client/Campo.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Campo implements java.io.Serializable { | 18 | public class Campo implements java.io.Serializable { |
| 14 | private java.lang.String nome; | 19 | private java.lang.String nome; |
src/main/java/br/gov/ans/integracao/sei/client/Cargo.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Cargo implements java.io.Serializable { | 18 | public class Cargo implements java.io.Serializable { |
| 14 | private java.lang.String idCargo; | 19 | private java.lang.String idCargo; |
src/main/java/br/gov/ans/integracao/sei/client/Cidade.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Cidade implements java.io.Serializable { | 18 | public class Cidade implements java.io.Serializable { |
| 14 | private java.lang.String idCidade; | 19 | private java.lang.String idCidade; |
src/main/java/br/gov/ans/integracao/sei/client/Contato.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Contato implements java.io.Serializable { | 18 | public class Contato implements java.io.Serializable { |
| 14 | private java.lang.String staOperacao; | 19 | private java.lang.String staOperacao; |
src/main/java/br/gov/ans/integracao/sei/client/DefinicaoMarcador.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class DefinicaoMarcador implements java.io.Serializable { | 18 | public class DefinicaoMarcador implements java.io.Serializable { |
| 14 | private java.lang.String protocoloProcedimento; | 19 | private java.lang.String protocoloProcedimento; |
src/main/java/br/gov/ans/integracao/sei/client/Destinatario.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Destinatario implements java.io.Serializable { | 18 | public class Destinatario implements java.io.Serializable { |
| 14 | private java.lang.String sigla; | 19 | private java.lang.String sigla; |
src/main/java/br/gov/ans/integracao/sei/client/Documento.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Documento implements java.io.Serializable { | 18 | public class Documento implements java.io.Serializable { |
| 14 | private java.lang.String tipo; | 19 | private java.lang.String tipo; |
src/main/java/br/gov/ans/integracao/sei/client/Estado.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Estado implements java.io.Serializable { | 18 | public class Estado implements java.io.Serializable { |
| 14 | private java.lang.String idEstado; | 19 | private java.lang.String idEstado; |
src/main/java/br/gov/ans/integracao/sei/client/HipoteseLegal.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class HipoteseLegal implements java.io.Serializable { | 18 | public class HipoteseLegal implements java.io.Serializable { |
| 14 | private java.lang.String idHipoteseLegal; | 19 | private java.lang.String idHipoteseLegal; |
src/main/java/br/gov/ans/integracao/sei/client/Interessado.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Interessado implements java.io.Serializable { | 18 | public class Interessado implements java.io.Serializable { |
| 14 | private java.lang.String sigla; | 19 | private java.lang.String sigla; |
src/main/java/br/gov/ans/integracao/sei/client/Marcador.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Marcador implements java.io.Serializable { | 18 | public class Marcador implements java.io.Serializable { |
| 14 | private java.lang.String idMarcador; | 19 | private java.lang.String idMarcador; |
src/main/java/br/gov/ans/integracao/sei/client/Observacao.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Observacao implements java.io.Serializable { | 18 | public class Observacao implements java.io.Serializable { |
| 14 | private java.lang.String descricao; | 19 | private java.lang.String descricao; |
src/main/java/br/gov/ans/integracao/sei/client/Pais.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Pais implements java.io.Serializable { | 18 | public class Pais implements java.io.Serializable { |
| 14 | private java.lang.String idPais; | 19 | private java.lang.String idPais; |
src/main/java/br/gov/ans/integracao/sei/client/Procedimento.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Procedimento implements java.io.Serializable { | 18 | public class Procedimento implements java.io.Serializable { |
| 14 | private java.lang.String idTipoProcedimento; | 19 | private java.lang.String idTipoProcedimento; |
src/main/java/br/gov/ans/integracao/sei/client/ProcedimentoResumido.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class ProcedimentoResumido implements java.io.Serializable { | 18 | public class ProcedimentoResumido implements java.io.Serializable { |
| 14 | private java.lang.String idProcedimento; | 19 | private java.lang.String idProcedimento; |
src/main/java/br/gov/ans/integracao/sei/client/ProtocoloBloco.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class ProtocoloBloco implements java.io.Serializable { | 18 | public class ProtocoloBloco implements java.io.Serializable { |
| 14 | private java.lang.String protocoloFormatado; | 19 | private java.lang.String protocoloFormatado; |
src/main/java/br/gov/ans/integracao/sei/client/Publicacao.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Publicacao implements java.io.Serializable { | 18 | public class Publicacao implements java.io.Serializable { |
| 14 | private java.lang.String nomeVeiculo; | 19 | private java.lang.String nomeVeiculo; |
src/main/java/br/gov/ans/integracao/sei/client/PublicacaoImprensaNacional.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class PublicacaoImprensaNacional implements java.io.Serializable { | 18 | public class PublicacaoImprensaNacional implements java.io.Serializable { |
| 14 | private java.lang.String siglaVeiculo; | 19 | private java.lang.String siglaVeiculo; |
src/main/java/br/gov/ans/integracao/sei/client/Remetente.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Remetente implements java.io.Serializable { | 18 | public class Remetente implements java.io.Serializable { |
| 14 | private java.lang.String sigla; | 19 | private java.lang.String sigla; |
src/main/java/br/gov/ans/integracao/sei/client/RetornoConsultaBloco.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class RetornoConsultaBloco implements java.io.Serializable { | 18 | public class RetornoConsultaBloco implements java.io.Serializable { |
| 14 | private java.lang.String idBloco; | 19 | private java.lang.String idBloco; |
src/main/java/br/gov/ans/integracao/sei/client/RetornoConsultaDocumento.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class RetornoConsultaDocumento implements java.io.Serializable { | 18 | public class RetornoConsultaDocumento implements java.io.Serializable { |
| 14 | private java.lang.String idProcedimento; | 19 | private java.lang.String idProcedimento; |
src/main/java/br/gov/ans/integracao/sei/client/RetornoConsultaProcedimento.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class RetornoConsultaProcedimento implements java.io.Serializable { | 18 | public class RetornoConsultaProcedimento implements java.io.Serializable { |
| 14 | private java.lang.String idProcedimento; | 19 | private java.lang.String idProcedimento; |
src/main/java/br/gov/ans/integracao/sei/client/RetornoGeracaoProcedimento.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class RetornoGeracaoProcedimento implements java.io.Serializable { | 18 | public class RetornoGeracaoProcedimento implements java.io.Serializable { |
| 14 | private java.lang.String idProcedimento; | 19 | private java.lang.String idProcedimento; |
src/main/java/br/gov/ans/integracao/sei/client/RetornoInclusaoDocumento.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class RetornoInclusaoDocumento implements java.io.Serializable { | 18 | public class RetornoInclusaoDocumento implements java.io.Serializable { |
| 14 | private java.lang.String idDocumento; | 19 | private java.lang.String idDocumento; |
src/main/java/br/gov/ans/integracao/sei/client/Serie.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Serie implements java.io.Serializable { | 18 | public class Serie implements java.io.Serializable { |
| 14 | private java.lang.String idSerie; | 19 | private java.lang.String idSerie; |
src/main/java/br/gov/ans/integracao/sei/client/TipoConferencia.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class TipoConferencia implements java.io.Serializable { | 18 | public class TipoConferencia implements java.io.Serializable { |
| 14 | private java.lang.String idTipoConferencia; | 19 | private java.lang.String idTipoConferencia; |
src/main/java/br/gov/ans/integracao/sei/client/TipoProcedimento.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class TipoProcedimento implements java.io.Serializable { | 18 | public class TipoProcedimento implements java.io.Serializable { |
| 14 | private java.lang.String idTipoProcedimento; | 19 | private java.lang.String idTipoProcedimento; |
src/main/java/br/gov/ans/integracao/sei/client/Unidade.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Unidade implements java.io.Serializable { | 18 | public class Unidade implements java.io.Serializable { |
| 14 | private java.lang.String idUnidade; | 19 | private java.lang.String idUnidade; |
src/main/java/br/gov/ans/integracao/sei/client/UnidadeProcedimentoAberto.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class UnidadeProcedimentoAberto implements java.io.Serializable { | 18 | public class UnidadeProcedimentoAberto implements java.io.Serializable { |
| 14 | private br.gov.ans.integracao.sei.client.Unidade unidade; | 19 | private br.gov.ans.integracao.sei.client.Unidade unidade; |
src/main/java/br/gov/ans/integracao/sei/client/Usuario.java
| @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | @@ -9,6 +9,11 @@ package br.gov.ans.integracao.sei.client; | ||
| 9 | 9 | ||
| 10 | import javax.xml.bind.annotation.XmlRootElement; | 10 | import javax.xml.bind.annotation.XmlRootElement; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 17 | @XmlRootElement |
| 13 | public class Usuario implements java.io.Serializable { | 18 | public class Usuario implements java.io.Serializable { |
| 14 | private java.lang.String idUsuario; | 19 | private java.lang.String idUsuario; |
src/main/java/br/gov/ans/integracao/sei/modelo/Arquivo.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class Arquivo { | 11 | public class Arquivo { |
| 7 | 12 |
src/main/java/br/gov/ans/integracao/sei/modelo/ArquivoCriado.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class ArquivoCriado { | 11 | public class ArquivoCriado { |
| 7 | private String identificador; | 12 | private String identificador; |
src/main/java/br/gov/ans/integracao/sei/modelo/AtribuicaoProcesso.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class AtribuicaoProcesso { | 11 | public class AtribuicaoProcesso { |
| 7 | 12 |
src/main/java/br/gov/ans/integracao/sei/modelo/CancelamentoDocumento.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class CancelamentoDocumento { | 11 | public class CancelamentoDocumento { |
| 7 | private String documento; | 12 | private String documento; |
src/main/java/br/gov/ans/integracao/sei/modelo/Cidade.java
| @@ -12,7 +12,11 @@ import javax.xml.bind.annotation.XmlRootElement; | @@ -12,7 +12,11 @@ import javax.xml.bind.annotation.XmlRootElement; | ||
| 12 | import javax.xml.bind.annotation.XmlTransient; | 12 | import javax.xml.bind.annotation.XmlTransient; |
| 13 | 13 | ||
| 14 | import org.codehaus.jackson.annotate.JsonIgnore; | 14 | import org.codehaus.jackson.annotate.JsonIgnore; |
| 15 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 16 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 15 | 17 | ||
| 18 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 19 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 16 | @XmlRootElement | 20 | @XmlRootElement |
| 17 | @Entity | 21 | @Entity |
| 18 | @Table(name="cidade") | 22 | @Table(name="cidade") |
src/main/java/br/gov/ans/integracao/sei/modelo/Contato.java
| @@ -9,6 +9,11 @@ import javax.persistence.NamedQueries; | @@ -9,6 +9,11 @@ import javax.persistence.NamedQueries; | ||
| 9 | import javax.persistence.NamedQuery; | 9 | import javax.persistence.NamedQuery; |
| 10 | import javax.persistence.Table; | 10 | import javax.persistence.Table; |
| 11 | 11 | ||
| 12 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 14 | + | ||
| 15 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 16 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @Entity | 17 | @Entity |
| 13 | @Table(name="contato") | 18 | @Table(name="contato") |
| 14 | @NamedQueries({@NamedQuery(name="Contato.pesquisarPorID", query="select c from Contato c where c.id = :id"), | 19 | @NamedQueries({@NamedQuery(name="Contato.pesquisarPorID", query="select c from Contato c where c.id = :id"), |
src/main/java/br/gov/ans/integracao/sei/modelo/DocumentoResumido.java
| @@ -10,6 +10,7 @@ import javax.persistence.OneToOne; | @@ -10,6 +10,7 @@ import javax.persistence.OneToOne; | ||
| 10 | import javax.persistence.SqlResultSetMapping; | 10 | import javax.persistence.SqlResultSetMapping; |
| 11 | import javax.xml.bind.annotation.XmlRootElement; | 11 | import javax.xml.bind.annotation.XmlRootElement; |
| 12 | 12 | ||
| 13 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | import org.codehaus.jackson.map.annotate.JsonSerialize; | 14 | import org.codehaus.jackson.map.annotate.JsonSerialize; |
| 14 | 15 | ||
| 15 | @XmlRootElement | 16 | @XmlRootElement |
| @@ -31,7 +32,8 @@ import org.codehaus.jackson.map.annotate.JsonSerialize; | @@ -31,7 +32,8 @@ import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 31 | @FieldResult(name = "codigo", column = "tipoCodigo"), | 32 | @FieldResult(name = "codigo", column = "tipoCodigo"), |
| 32 | @FieldResult(name = "nome", column = "tipoNome")}) | 33 | @FieldResult(name = "nome", column = "tipoNome")}) |
| 33 | }) | 34 | }) |
| 34 | -@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) | 35 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) |
| 36 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 35 | public class DocumentoResumido { | 37 | public class DocumentoResumido { |
| 36 | @Id | 38 | @Id |
| 37 | private String numero; | 39 | private String numero; |
src/main/java/br/gov/ans/integracao/sei/modelo/Endereco.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class Endereco { | 11 | public class Endereco { |
| 7 | private String logradouro; | 12 | private String logradouro; |
src/main/java/br/gov/ans/integracao/sei/modelo/EnvioDeProcesso.java
| @@ -4,6 +4,11 @@ import java.util.Date; | @@ -4,6 +4,11 @@ import java.util.Date; | ||
| 4 | 4 | ||
| 5 | import javax.xml.bind.annotation.XmlRootElement; | 5 | import javax.xml.bind.annotation.XmlRootElement; |
| 6 | 6 | ||
| 7 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 8 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 9 | + | ||
| 10 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 11 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 7 | @XmlRootElement | 12 | @XmlRootElement |
| 8 | public class EnvioDeProcesso { | 13 | public class EnvioDeProcesso { |
| 9 | private String numeroDoProcesso; | 14 | private String numeroDoProcesso; |
src/main/java/br/gov/ans/integracao/sei/modelo/Estado.java
| @@ -8,7 +8,11 @@ import javax.xml.bind.annotation.XmlRootElement; | @@ -8,7 +8,11 @@ import javax.xml.bind.annotation.XmlRootElement; | ||
| 8 | import javax.xml.bind.annotation.XmlTransient; | 8 | import javax.xml.bind.annotation.XmlTransient; |
| 9 | 9 | ||
| 10 | import org.codehaus.jackson.annotate.JsonIgnore; | 10 | import org.codehaus.jackson.annotate.JsonIgnore; |
| 11 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 12 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 11 | 13 | ||
| 14 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 15 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 12 | @XmlRootElement | 16 | @XmlRootElement |
| 13 | @Entity | 17 | @Entity |
| 14 | @Table(name = "uf") | 18 | @Table(name = "uf") |
src/main/java/br/gov/ans/integracao/sei/modelo/ExclusaoDocumento.java
| @@ -15,7 +15,11 @@ import javax.xml.bind.annotation.XmlRootElement; | @@ -15,7 +15,11 @@ import javax.xml.bind.annotation.XmlRootElement; | ||
| 15 | import javax.xml.bind.annotation.XmlTransient; | 15 | import javax.xml.bind.annotation.XmlTransient; |
| 16 | 16 | ||
| 17 | import org.codehaus.jackson.annotate.JsonIgnore; | 17 | import org.codehaus.jackson.annotate.JsonIgnore; |
| 18 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 19 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 18 | 20 | ||
| 21 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 22 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 19 | @XmlRootElement | 23 | @XmlRootElement |
| 20 | @Entity | 24 | @Entity |
| 21 | @Table(schema = "ANS_GERAL", name = "TB_EXCLUSAO_DOCUMENTO_BROKER") | 25 | @Table(schema = "ANS_GERAL", name = "TB_EXCLUSAO_DOCUMENTO_BROKER") |
src/main/java/br/gov/ans/integracao/sei/modelo/InclusaoDocumento.java
| @@ -15,9 +15,13 @@ import javax.xml.bind.annotation.XmlRootElement; | @@ -15,9 +15,13 @@ import javax.xml.bind.annotation.XmlRootElement; | ||
| 15 | import javax.xml.bind.annotation.XmlTransient; | 15 | import javax.xml.bind.annotation.XmlTransient; |
| 16 | 16 | ||
| 17 | import org.codehaus.jackson.annotate.JsonIgnore; | 17 | import org.codehaus.jackson.annotate.JsonIgnore; |
| 18 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 19 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 18 | 20 | ||
| 19 | import br.gov.ans.integracao.sei.client.Documento; | 21 | import br.gov.ans.integracao.sei.client.Documento; |
| 20 | 22 | ||
| 23 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 24 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 21 | @XmlRootElement | 25 | @XmlRootElement |
| 22 | @Entity | 26 | @Entity |
| 23 | @Table(schema="ANS_GERAL",name="TB_INCLUSAO_DOCUMENTO_BROKER") | 27 | @Table(schema="ANS_GERAL",name="TB_INCLUSAO_DOCUMENTO_BROKER") |
src/main/java/br/gov/ans/integracao/sei/modelo/InclusaoDocumentoBloco.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class InclusaoDocumentoBloco { | 11 | public class InclusaoDocumentoBloco { |
| 7 | private String bloco; | 12 | private String bloco; |
src/main/java/br/gov/ans/integracao/sei/modelo/InclusaoProcessoBloco.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class InclusaoProcessoBloco { | 11 | public class InclusaoProcessoBloco { |
| 7 | private String bloco; | 12 | private String bloco; |
src/main/java/br/gov/ans/integracao/sei/modelo/MarcacaoProcesso.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class MarcacaoProcesso { | 11 | public class MarcacaoProcesso { |
| 7 | 12 |
src/main/java/br/gov/ans/integracao/sei/modelo/Motivo.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class Motivo { | 11 | public class Motivo { |
| 7 | String motivo; | 12 | String motivo; |
src/main/java/br/gov/ans/integracao/sei/modelo/NovoAndamento.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import java.util.HashMap; | 3 | import java.util.HashMap; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | public class NovoAndamento { | 10 | public class NovoAndamento { |
| 6 | 11 | ||
| 7 | private String tarefa; | 12 | private String tarefa; |
src/main/java/br/gov/ans/integracao/sei/modelo/NovoBloco.java
| @@ -3,10 +3,12 @@ package br.gov.ans.integracao.sei.modelo; | @@ -3,10 +3,12 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | import org.codehaus.jackson.annotate.JsonIgnoreProperties; | 5 | import org.codehaus.jackson.annotate.JsonIgnoreProperties; |
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 6 | 7 | ||
| 7 | import br.gov.ans.integracao.sei.modelo.enums.TipoBloco; | 8 | import br.gov.ans.integracao.sei.modelo.enums.TipoBloco; |
| 8 | 9 | ||
| 9 | @XmlRootElement | 10 | @XmlRootElement |
| 11 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 10 | @JsonIgnoreProperties(ignoreUnknown = true) | 12 | @JsonIgnoreProperties(ignoreUnknown = true) |
| 11 | public class NovoBloco { | 13 | public class NovoBloco { |
| 12 | 14 |
src/main/java/br/gov/ans/integracao/sei/modelo/NovoProcesso.java
| @@ -4,9 +4,14 @@ import java.util.Date; | @@ -4,9 +4,14 @@ import java.util.Date; | ||
| 4 | 4 | ||
| 5 | import javax.xml.bind.annotation.XmlRootElement; | 5 | import javax.xml.bind.annotation.XmlRootElement; |
| 6 | 6 | ||
| 7 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 8 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 9 | + | ||
| 7 | import br.gov.ans.integracao.sei.client.Documento; | 10 | import br.gov.ans.integracao.sei.client.Documento; |
| 8 | import br.gov.ans.integracao.sei.client.Procedimento; | 11 | import br.gov.ans.integracao.sei.client.Procedimento; |
| 9 | 12 | ||
| 13 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 14 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 10 | @XmlRootElement | 15 | @XmlRootElement |
| 11 | public class NovoProcesso { | 16 | public class NovoProcesso { |
| 12 | private Procedimento dadosProcesso; | 17 | private Procedimento dadosProcesso; |
src/main/java/br/gov/ans/integracao/sei/modelo/ParteArquivo.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class ParteArquivo { | 11 | public class ParteArquivo { |
| 7 | private String arquivo; | 12 | private String arquivo; |
src/main/java/br/gov/ans/integracao/sei/modelo/Pessoa.java
| @@ -5,7 +5,9 @@ import javax.xml.bind.annotation.XmlRootElement; | @@ -5,7 +5,9 @@ import javax.xml.bind.annotation.XmlRootElement; | ||
| 5 | import org.codehaus.jackson.annotate.JsonIgnoreProperties; | 5 | import org.codehaus.jackson.annotate.JsonIgnoreProperties; |
| 6 | import org.codehaus.jackson.annotate.JsonSubTypes; | 6 | import org.codehaus.jackson.annotate.JsonSubTypes; |
| 7 | import org.codehaus.jackson.annotate.JsonTypeInfo; | 7 | import org.codehaus.jackson.annotate.JsonTypeInfo; |
| 8 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 8 | 9 | ||
| 10 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | @JsonIgnoreProperties(ignoreUnknown = true) | 11 | @JsonIgnoreProperties(ignoreUnknown = true) |
| 10 | @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY) | 12 | @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY) |
| 11 | @JsonSubTypes({ | 13 | @JsonSubTypes({ |
src/main/java/br/gov/ans/integracao/sei/modelo/PessoaFisica.java
| @@ -4,8 +4,13 @@ import java.util.Date; | @@ -4,8 +4,13 @@ import java.util.Date; | ||
| 4 | 4 | ||
| 5 | import javax.xml.bind.annotation.XmlRootElement; | 5 | import javax.xml.bind.annotation.XmlRootElement; |
| 6 | 6 | ||
| 7 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 8 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 9 | + | ||
| 7 | import br.gov.ans.integracao.sei.modelo.enums.Sexo; | 10 | import br.gov.ans.integracao.sei.modelo.enums.Sexo; |
| 8 | 11 | ||
| 12 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 13 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 9 | @XmlRootElement | 14 | @XmlRootElement |
| 10 | public class PessoaFisica extends Pessoa { | 15 | public class PessoaFisica extends Pessoa { |
| 11 | private Sexo sexo; | 16 | private Sexo sexo; |
src/main/java/br/gov/ans/integracao/sei/modelo/PessoaJuridica.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class PessoaJuridica extends Pessoa { | 11 | public class PessoaJuridica extends Pessoa { |
| 7 | private String cnpj; | 12 | private String cnpj; |
src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoAnexado.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class ProcessoAnexado { | 11 | public class ProcessoAnexado { |
| 7 | private String numero; | 12 | private String numero; |
src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoBloqueado.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class ProcessoBloqueado { | 11 | public class ProcessoBloqueado { |
| 7 | private String numero; | 12 | private String numero; |
src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoRelacionado.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class ProcessoRelacionado { | 11 | public class ProcessoRelacionado { |
| 7 | private String numero; | 12 | private String numero; |
src/main/java/br/gov/ans/integracao/sei/modelo/ProcessoResumido.java
| @@ -10,6 +10,7 @@ import javax.persistence.OneToOne; | @@ -10,6 +10,7 @@ import javax.persistence.OneToOne; | ||
| 10 | import javax.persistence.SqlResultSetMapping; | 10 | import javax.persistence.SqlResultSetMapping; |
| 11 | import javax.xml.bind.annotation.XmlRootElement; | 11 | import javax.xml.bind.annotation.XmlRootElement; |
| 12 | 12 | ||
| 13 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 13 | import org.codehaus.jackson.map.annotate.JsonSerialize; | 14 | import org.codehaus.jackson.map.annotate.JsonSerialize; |
| 14 | 15 | ||
| 15 | @XmlRootElement | 16 | @XmlRootElement |
| @@ -28,7 +29,8 @@ import org.codehaus.jackson.map.annotate.JsonSerialize; | @@ -28,7 +29,8 @@ import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 28 | @FieldResult(name = "codigo", column = "tipoCodigo"), | 29 | @FieldResult(name = "codigo", column = "tipoCodigo"), |
| 29 | @FieldResult(name = "nome", column = "tipoNome")}) | 30 | @FieldResult(name = "nome", column = "tipoNome")}) |
| 30 | }) | 31 | }) |
| 31 | -@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) | 32 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) |
| 33 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 32 | public class ProcessoResumido { | 34 | public class ProcessoResumido { |
| 33 | 35 | ||
| 34 | @Id | 36 | @Id |
src/main/java/br/gov/ans/integracao/sei/modelo/ResultadoConsultaDocumento.java
| @@ -2,9 +2,14 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,9 +2,14 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 5 | import br.gov.ans.integracao.sei.client.RetornoConsultaDocumento; | 8 | import br.gov.ans.integracao.sei.client.RetornoConsultaDocumento; |
| 6 | import br.gov.ans.integracao.sipar.dao.DocumentoSipar; | 9 | import br.gov.ans.integracao.sipar.dao.DocumentoSipar; |
| 7 | 10 | ||
| 11 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 12 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 8 | @XmlRootElement | 13 | @XmlRootElement |
| 9 | public class ResultadoConsultaDocumento { | 14 | public class ResultadoConsultaDocumento { |
| 10 | 15 |
src/main/java/br/gov/ans/integracao/sei/modelo/ResultadoConsultaProcesso.java
| @@ -2,9 +2,14 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,9 +2,14 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 5 | import br.gov.ans.integracao.sei.client.RetornoConsultaProcedimento; | 8 | import br.gov.ans.integracao.sei.client.RetornoConsultaProcedimento; |
| 6 | import br.gov.ans.integracao.sipar.dao.DocumentoSipar; | 9 | import br.gov.ans.integracao.sipar.dao.DocumentoSipar; |
| 7 | 10 | ||
| 11 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 12 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 8 | @XmlRootElement | 13 | @XmlRootElement |
| 9 | public class ResultadoConsultaProcesso { | 14 | public class ResultadoConsultaProcesso { |
| 10 | 15 |
src/main/java/br/gov/ans/integracao/sei/modelo/ResultadoInclusaoDocumento.java
| @@ -2,8 +2,13 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,8 +2,13 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 5 | import br.gov.ans.integracao.sei.client.RetornoInclusaoDocumento; | 8 | import br.gov.ans.integracao.sei.client.RetornoInclusaoDocumento; |
| 6 | 9 | ||
| 10 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 11 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 7 | @XmlRootElement | 12 | @XmlRootElement |
| 8 | public class ResultadoInclusaoDocumento { | 13 | public class ResultadoInclusaoDocumento { |
| 9 | private RetornoInclusaoDocumento retorno; | 14 | private RetornoInclusaoDocumento retorno; |
src/main/java/br/gov/ans/integracao/sei/modelo/SobrestamentoProcesso.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class SobrestamentoProcesso { | 11 | public class SobrestamentoProcesso { |
| 7 | private String processo; | 12 | private String processo; |
src/main/java/br/gov/ans/integracao/sei/modelo/Tarefa.java
| @@ -8,6 +8,11 @@ import javax.persistence.NamedQuery; | @@ -8,6 +8,11 @@ import javax.persistence.NamedQuery; | ||
| 8 | import javax.persistence.Table; | 8 | import javax.persistence.Table; |
| 9 | import javax.xml.bind.annotation.XmlRootElement; | 9 | import javax.xml.bind.annotation.XmlRootElement; |
| 10 | 10 | ||
| 11 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 12 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 13 | + | ||
| 14 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 15 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 11 | @XmlRootElement | 16 | @XmlRootElement |
| 12 | @Entity | 17 | @Entity |
| 13 | @Table(name="tarefa") | 18 | @Table(name="tarefa") |
src/main/java/br/gov/ans/integracao/sei/modelo/Template.java
| @@ -4,6 +4,11 @@ import java.util.Date; | @@ -4,6 +4,11 @@ import java.util.Date; | ||
| 4 | 4 | ||
| 5 | import javax.xml.bind.annotation.XmlRootElement; | 5 | import javax.xml.bind.annotation.XmlRootElement; |
| 6 | 6 | ||
| 7 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 8 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 9 | + | ||
| 10 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 11 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 7 | @XmlRootElement | 12 | @XmlRootElement |
| 8 | public class Template { | 13 | public class Template { |
| 9 | private String nome; | 14 | private String nome; |
src/main/java/br/gov/ans/integracao/sei/modelo/Tipo.java
| 1 | package br.gov.ans.integracao.sei.modelo; | 1 | package br.gov.ans.integracao.sei.modelo; |
| 2 | 2 | ||
| 3 | import javax.persistence.Entity; | 3 | import javax.persistence.Entity; |
| 4 | -import javax.persistence.EntityResult; | ||
| 5 | -import javax.persistence.FieldResult; | ||
| 6 | import javax.persistence.Id; | 4 | import javax.persistence.Id; |
| 7 | -import javax.persistence.SqlResultSetMapping; | ||
| 8 | import javax.xml.bind.annotation.XmlRootElement; | 5 | import javax.xml.bind.annotation.XmlRootElement; |
| 9 | 6 | ||
| 7 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 8 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 9 | + | ||
| 10 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 11 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 10 | @Entity | 12 | @Entity |
| 11 | //@SqlResultSetMapping(name = "TipoMapping", entities = { @EntityResult(entityClass = Tipo.class, fields = { | 13 | //@SqlResultSetMapping(name = "TipoMapping", entities = { @EntityResult(entityClass = Tipo.class, fields = { |
| 12 | // @FieldResult(name = "codigo", column = "tipoCodigo"), @FieldResult(name = "nome", column = "tipoNome") }) }) | 14 | // @FieldResult(name = "codigo", column = "tipoCodigo"), @FieldResult(name = "nome", column = "tipoNome") }) }) |
src/main/java/br/gov/ans/integracao/sei/modelo/TipoContato.java
| @@ -8,6 +8,11 @@ import javax.persistence.NamedQuery; | @@ -8,6 +8,11 @@ import javax.persistence.NamedQuery; | ||
| 8 | import javax.persistence.Table; | 8 | import javax.persistence.Table; |
| 9 | import javax.xml.bind.annotation.XmlRootElement; | 9 | import javax.xml.bind.annotation.XmlRootElement; |
| 10 | 10 | ||
| 11 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 12 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 13 | + | ||
| 14 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 15 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 11 | @XmlRootElement | 16 | @XmlRootElement |
| 12 | @Entity | 17 | @Entity |
| 13 | @Table(name="tipo_contato") | 18 | @Table(name="tipo_contato") |
src/main/java/br/gov/ans/integracao/sei/modelo/TipoDocumento.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class TipoDocumento { | 11 | public class TipoDocumento { |
| 7 | private String identificador; | 12 | private String identificador; |
src/main/java/br/gov/ans/integracao/sei/modelo/Usuario.java
| @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | @@ -2,6 +2,11 @@ package br.gov.ans.integracao.sei.modelo; | ||
| 2 | 2 | ||
| 3 | import javax.xml.bind.annotation.XmlRootElement; | 3 | import javax.xml.bind.annotation.XmlRootElement; |
| 4 | 4 | ||
| 5 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 6 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 7 | + | ||
| 8 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 5 | @XmlRootElement | 10 | @XmlRootElement |
| 6 | public class Usuario { | 11 | public class Usuario { |
| 7 | private String codigo; | 12 | private String codigo; |
src/main/java/br/gov/ans/integracao/templates/client/ClientTemplatesBroker.java
| @@ -5,7 +5,6 @@ import javax.ws.rs.ProcessingException; | @@ -5,7 +5,6 @@ import javax.ws.rs.ProcessingException; | ||
| 5 | import javax.ws.rs.client.Client; | 5 | import javax.ws.rs.client.Client; |
| 6 | import javax.ws.rs.core.MediaType; | 6 | import javax.ws.rs.core.MediaType; |
| 7 | import javax.ws.rs.core.Response; | 7 | import javax.ws.rs.core.Response; |
| 8 | -import javax.ws.rs.core.Response.Status; | ||
| 9 | import javax.ws.rs.core.Response.Status.Family; | 8 | import javax.ws.rs.core.Response.Status.Family; |
| 10 | 9 | ||
| 11 | import org.jboss.logging.Logger; | 10 | import org.jboss.logging.Logger; |
src/main/java/br/gov/ans/modelo/LogIntegracaoSistemica.java
| @@ -15,6 +15,11 @@ import javax.persistence.Temporal; | @@ -15,6 +15,11 @@ import javax.persistence.Temporal; | ||
| 15 | import javax.persistence.TemporalType; | 15 | import javax.persistence.TemporalType; |
| 16 | import javax.xml.bind.annotation.XmlRootElement; | 16 | import javax.xml.bind.annotation.XmlRootElement; |
| 17 | 17 | ||
| 18 | +import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
| 19 | +import org.codehaus.jackson.map.annotate.JsonSerialize; | ||
| 20 | + | ||
| 21 | +@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) | ||
| 22 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 18 | @XmlRootElement | 23 | @XmlRootElement |
| 19 | @Entity | 24 | @Entity |
| 20 | @Table(schema="ANS_GERAL",name="TB_LOG_INTEGRACAO_SISTEMICA") | 25 | @Table(schema="ANS_GERAL",name="TB_LOG_INTEGRACAO_SISTEMICA") |
src/test/java/br/gov/ans/integracao/sei/testes/FunctionalTest.java
| @@ -6,8 +6,8 @@ import com.jayway.restassured.RestAssured; | @@ -6,8 +6,8 @@ import com.jayway.restassured.RestAssured; | ||
| 6 | 6 | ||
| 7 | public class FunctionalTest { | 7 | public class FunctionalTest { |
| 8 | 8 | ||
| 9 | - protected final String USUARIO = "andre.guimaraes"; | ||
| 10 | - protected final String SENHA = "*****"; | 9 | + protected final String USUARIO = "desenv_integracao_sei"; |
| 10 | + protected final String SENHA = "integra_sei_2016"; | ||
| 11 | protected static final Boolean DESENVOLVIMENTO = true; | 11 | protected static final Boolean DESENVOLVIMENTO = true; |
| 12 | 12 | ||
| 13 | @BeforeClass | 13 | @BeforeClass |