diff --git a/src/main/java/br/gov/ans/integracao/sei/rest/DocumentoResource.java b/src/main/java/br/gov/ans/integracao/sei/rest/DocumentoResource.java index c57b8a1..81436e8 100644 --- a/src/main/java/br/gov/ans/integracao/sei/rest/DocumentoResource.java +++ b/src/main/java/br/gov/ans/integracao/sei/rest/DocumentoResource.java @@ -105,9 +105,7 @@ public class DocumentoResource { @Inject private UserTransaction userTransaction; - - private static String NAO = "N"; - + /** * @api {get} /:unidade/documentos/:documento Consultar documento * @apiName consultarDocumento @@ -510,7 +508,7 @@ public class DocumentoResource { @Produces(MediaType.APPLICATION_OCTET_STREAM) public Response exportarDocumento(@PathParam("unidade") String unidade, @PathParam("documento") String documento) throws Exception{ RetornoConsultaDocumento retorno = seiNativeService.consultarDocumento(Constantes.SEI_BROKER, Operacao.CONSULTAR_DOCUMENTO, unidadeResource.consultarCodigo(unidade), documento, - NAO, NAO, NAO, NAO); + Constantes.NAO, Constantes.NAO, Constantes.NAO, Constantes.NAO); String linkAcesso = retorno.getLinkAcesso(); @@ -723,7 +721,7 @@ public class DocumentoResource { return encodeBase64(html); }catch(JsonParseException ex){ - logger.warn(conteudo); + logger.debug(conteudo); throw new BusinessException(messages.getMessage("erro.processar.conteudo.json")); } } diff --git a/src/main/java/br/gov/ans/integracao/sei/rest/UnidadeResource.java b/src/main/java/br/gov/ans/integracao/sei/rest/UnidadeResource.java index 708596f..872fa5d 100644 --- a/src/main/java/br/gov/ans/integracao/sei/rest/UnidadeResource.java +++ b/src/main/java/br/gov/ans/integracao/sei/rest/UnidadeResource.java @@ -67,7 +67,7 @@ public class UnidadeResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) public br.gov.ans.integracao.sei.client.Unidade[] listarUnidades() throws Exception{ Unidade[] lista = seiNativeService.listarUnidades(Constantes.SEI_BROKER, Operacao.LISTAR_UNIDADES, null, null); - + carregarMapUnidades(lista); return lista; diff --git a/src/main/java/br/gov/ans/integracao/sei/utils/Constantes.java b/src/main/java/br/gov/ans/integracao/sei/utils/Constantes.java index 5437099..b6ef34a 100644 --- a/src/main/java/br/gov/ans/integracao/sei/utils/Constantes.java +++ b/src/main/java/br/gov/ans/integracao/sei/utils/Constantes.java @@ -10,13 +10,16 @@ public class Constantes { public static final int AXIS_TIMEOUT = 1000 * (60 * AXIS_TIMEOUT_IN_MINUTES); public static final String CODIGO_BRASIL = "76"; public static final String CODIGO_ORGAO_ANS = "0"; + public static final String DATE_PATTERN = "dd/MM/yyyy"; public static final String DOCUMENTO_GERAL = "G"; public static final String DOCUMENTO_RECEBIDO = "R"; public static final String MASCARA_PROCESSO_17 = "#####.######/####-##"; public static final String MASCARA_PROCESSO_21 = "#######.########/####-##"; + public static String NAO = "N"; public static final String JBOSS_HOME = System.getProperty("jboss.home.dir"); public static final String NOME_SISTEMA = "sei-broker"; public static final String REGEX_MASCARA_PROCESSO = "(\\d)(\\d)(\\d)(\\d)(\\d)(\\.)(\\d)(\\d)(\\d)(\\d)(\\d)(\\d)(\\/)(\\d)(\\d)(\\d)(\\d)(-)(\\d)(\\d)"; + public static final String REGEX_SOMENTE_NUMEROS = "\\D+"; public static final String SEI_BROKER = "SEI-Broker"; public static final int TAMANHO_MAXIMO_ARQUIVO = 16777216; public static final int TAMANHO_MAXIMO_DOCUMENTO = 22020096; diff --git a/src/main/java/br/gov/ans/integracao/sei/utils/ContatoHelper.java b/src/main/java/br/gov/ans/integracao/sei/utils/ContatoHelper.java index 5921760..802954c 100644 --- a/src/main/java/br/gov/ans/integracao/sei/utils/ContatoHelper.java +++ b/src/main/java/br/gov/ans/integracao/sei/utils/ContatoHelper.java @@ -3,12 +3,11 @@ package br.gov.ans.integracao.sei.utils; import static br.gov.ans.integracao.sei.utils.Util.getSOuN; import java.rmi.RemoteException; -import java.text.DateFormat; -import java.text.SimpleDateFormat; import javax.inject.Inject; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.FastDateFormat; import br.gov.ans.exceptions.BusinessException; import br.gov.ans.integracao.sei.client.Contato; @@ -23,7 +22,7 @@ import br.gov.ans.integracao.sei.modelo.enums.TipoPessoa; public class ContatoHelper { - private DateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); + private static final FastDateFormat formatter = FastDateFormat.getInstance(Constantes.DATE_PATTERN); @Inject private ContatoDAO contatoDAO; diff --git a/src/main/java/br/gov/ans/integracao/sei/utils/PessoaHelper.java b/src/main/java/br/gov/ans/integracao/sei/utils/PessoaHelper.java index fc373bf..a0198f9 100644 --- a/src/main/java/br/gov/ans/integracao/sei/utils/PessoaHelper.java +++ b/src/main/java/br/gov/ans/integracao/sei/utils/PessoaHelper.java @@ -1,9 +1,7 @@ package br.gov.ans.integracao.sei.utils; import java.lang.reflect.Field; -import java.text.DateFormat; import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -12,6 +10,7 @@ import javax.inject.Inject; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.FieldUtils; +import org.apache.commons.lang3.time.FastDateFormat; import org.jboss.logging.Logger; import br.gov.ans.exceptions.BusinessException; @@ -41,7 +40,7 @@ public class PessoaHelper { @Inject private MessageUtils messages; - private DateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); + private static final FastDateFormat formatter = FastDateFormat.getInstance(Constantes.DATE_PATTERN); public List buildPessoa(Contato[] contatos) throws ParseException, BusinessException, IllegalAccessException, ResourceNotFoundException{ if(ArrayUtils.isNotEmpty(contatos)){ diff --git a/src/main/java/br/gov/ans/integracao/sei/utils/Util.java b/src/main/java/br/gov/ans/integracao/sei/utils/Util.java index c401eec..cf1c9de 100644 --- a/src/main/java/br/gov/ans/integracao/sei/utils/Util.java +++ b/src/main/java/br/gov/ans/integracao/sei/utils/Util.java @@ -2,17 +2,16 @@ package br.gov.ans.integracao.sei.utils; import java.io.IOException; import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.Map; -import java.util.regex.Pattern; import javax.persistence.Query; import javax.swing.text.MaskFormatter; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.FastDateFormat; import org.codehaus.jackson.JsonParseException; import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.map.ObjectMapper; @@ -21,7 +20,7 @@ import org.codehaus.jackson.type.TypeReference; import br.gov.ans.exceptions.BusinessException; public class Util { - private static final String REGEX_SOMENTE_NUMEROS = "\\D+"; + private static final FastDateFormat dateFormater = FastDateFormat.getInstance(Constantes.DATE_PATTERN); public static String getSOuN(String valor){ if("S".equals(valor) || "s".equals(valor)){ @@ -40,8 +39,6 @@ public class Util { } public static String formatarData(Date data){ - SimpleDateFormat dateFormater = new SimpleDateFormat("dd/MM/yyyy"); - if(data != null){ return dateFormater.format(data); } @@ -167,6 +164,6 @@ public class Util { } public static String getOnlyNumbers(String string) throws Exception{ - return string.replaceAll(REGEX_SOMENTE_NUMEROS,""); + return string.replaceAll(Constantes.REGEX_SOMENTE_NUMEROS,""); } } -- libgit2 0.21.2