diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandler.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandler.java index 0188265..0640796 100644 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandler.java +++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandler.java @@ -43,10 +43,7 @@ import javax.faces.context.ExceptionHandler; import javax.faces.context.FacesContext; import javax.faces.event.PhaseId; -import org.slf4j.Logger; - import br.gov.frameworkdemoiselle.DemoiselleException; -import br.gov.frameworkdemoiselle.internal.configuration.ExceptionHandlerConfigCompatible; import br.gov.frameworkdemoiselle.internal.configuration.ExceptionHandlerConfig; import br.gov.frameworkdemoiselle.util.Beans; import br.gov.frameworkdemoiselle.util.Exceptions; @@ -54,7 +51,6 @@ import br.gov.frameworkdemoiselle.util.Faces; import br.gov.frameworkdemoiselle.util.PageNotFoundException; import br.gov.frameworkdemoiselle.util.Redirector; -@SuppressWarnings("deprecation") public class ApplicationExceptionHandler extends AbstractExceptionHandler { public ApplicationExceptionHandler(final ExceptionHandler wrapped) { @@ -62,20 +58,6 @@ public class ApplicationExceptionHandler extends AbstractExceptionHandler { } protected boolean handleException(final Throwable cause, FacesContext facesContext) { - // Apenas para manter compatibilidade entre 2.3.x e 2.4.0-RCx - ExceptionHandlerConfigCompatible compatibleConfig = Beans.getReference(ExceptionHandlerConfigCompatible.class); - // Usuário está utilizando pelo menos uma das propriedades com a forma depreciada de forma explícita - if (!(compatibleConfig.getExceptionPage().equals("/application_error") && compatibleConfig.isHandleApplicationException())) { - Logger logger = Beans.getReference(Logger.class); - logger.warn("As propriedades frameworkdemoiselle.handle.application.exception e" - + " frameworkdemoiselle.handle.application.exception.page" - + " não serão suportadas nas próximas versões do framework." - + " Para evitar futuros problemas atualize as propriedades para" - + " frameworkdemoiselle.exception.application.handle e" - + " frameworkdemoiselle.exception.default.redirect.page, respectivamente."); - return handleExceptionCompatibleConfiguration(compatibleConfig, cause, facesContext); - } - boolean handled = false; ExceptionHandlerConfig config = Beans.getReference(ExceptionHandlerConfig.class); @@ -92,42 +74,6 @@ public class ApplicationExceptionHandler extends AbstractExceptionHandler { return handled; } - @Deprecated - private boolean handleExceptionCompatibleConfiguration(ExceptionHandlerConfigCompatible config, final Throwable cause, - FacesContext facesContext) { - boolean handled = false; - - if (config.isHandleApplicationException() && Exceptions.isApplicationException(cause)) { - - if (isRendering(facesContext)) { - handled = handlingDuringRenderResponseCompatible(cause, config); - } else { - Faces.addMessage(cause); - handled = true; - } - } - return handled; - } - - @Deprecated - private boolean handlingDuringRenderResponseCompatible(final Throwable cause, final ExceptionHandlerConfigCompatible config) { - boolean handled = false; - try { - Map map = new HashMap(); - map.put("exception", cause.getMessage()); - Redirector.redirect(config.getExceptionPage(), map); - handled = true; - } catch (PageNotFoundException ex) { - // TODO Colocar a mensagem no bundle - throw new DemoiselleException( - "A tela de exibição de erros: \"" - + ex.getViewId() - + "\" não foi encontrada. Caso o seu projeto possua outra, defina no arquivo de configuração a chave \"" - + "frameworkdemoiselle.handle.application.exception.page" + "\"", ex); - } - return handled; - } - private boolean isRendering(FacesContext context) { return PhaseId.RENDER_RESPONSE.equals(context.getCurrentPhaseId()); } diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/FileRendererImpl.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/FileRendererImpl.java index 854a41c..9abd257 100644 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/FileRendererImpl.java +++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/FileRendererImpl.java @@ -36,19 +36,20 @@ */ package br.gov.frameworkdemoiselle.internal.implementation; +import static java.util.logging.Level.WARNING; + import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; +import java.util.logging.Logger; import javax.faces.context.FacesContext; import javax.inject.Inject; import javax.servlet.http.HttpServletResponse; -import org.slf4j.Logger; - import br.gov.frameworkdemoiselle.util.Faces; import br.gov.frameworkdemoiselle.util.FileRenderer; @@ -69,38 +70,40 @@ public class FileRendererImpl implements FileRenderer { private FacesContext context; @Override - public void render(final byte[] byteArray, final ContentType contentType, final String fileName, boolean forceDownload) { - logger.debug("Renderizando para o arquivo " + fileName + "."); + public void render(final byte[] byteArray, final ContentType contentType, final String fileName, + boolean forceDownload) { + logger.fine("Renderizando para o arquivo " + fileName + "."); try { response.setContentType(contentType.getContentType()); response.setContentLength(byteArray.length); - + String forceDownloadCommand = forceDownload ? "attachment; " : ""; response.setHeader("Content-Disposition", forceDownloadCommand + "filename=\"" + fileName + "\""); - logger.debug("Escrevendo o arquivo " + fileName + " no response."); + logger.fine("Escrevendo o arquivo " + fileName + " no response."); response.getOutputStream().write(byteArray, 0, byteArray.length); response.getOutputStream().flush(); response.getOutputStream().close(); } catch (IOException e) { - logger.info("Erro na geração do relatório. Incluíndo a exceção de erro em um FacesMessage", e); + logger.log(WARNING, "Erro na geração do relatório. Incluíndo a exceção de erro em um FacesMessage", e); Faces.addMessage(e); } context.responseComplete(); } - + @Override public void render(final byte[] byteArray, final ContentType contentType, final String fileName) { render(byteArray, contentType, fileName, false); } @Override - public void render(final InputStream stream, final ContentType contentType, final String fileName, boolean forceDownload) { - logger.debug("Renderizando o arquivo " + fileName + "."); + public void render(final InputStream stream, final ContentType contentType, final String fileName, + boolean forceDownload) { + logger.fine("Renderizando o arquivo " + fileName + "."); render(getBytes(stream), contentType, fileName, forceDownload); } - + @Override public void render(final InputStream stream, final ContentType contentType, final String fileName) { render(stream, contentType, fileName, false); @@ -108,15 +111,15 @@ public class FileRendererImpl implements FileRenderer { @Override public void render(File file, ContentType contentType, String fileName, boolean forceDownload) { - logger.debug("Renderizando para o arquivo " + fileName + "."); + logger.fine("Renderizando para o arquivo " + fileName + "."); try { render(new FileInputStream(file), contentType, fileName, forceDownload); } catch (FileNotFoundException e) { - logger.info("Erro na geração do relatório. Incluíndo a exceção de erro em um FacesMessage", e); + logger.log(WARNING, "Erro na geração do relatório. Incluíndo a exceção de erro em um FacesMessage", e); Faces.addMessage(e); } } - + @Override public void render(File file, ContentType contentType, String fileName) { render(file, contentType, fileName, false); diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityObserver.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityObserver.java index 7a564b8..0dc7d96 100644 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityObserver.java +++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityObserver.java @@ -39,6 +39,7 @@ package br.gov.frameworkdemoiselle.internal.implementation; import java.io.Serializable; import java.util.HashMap; import java.util.Map; +import java.util.logging.Logger; import javax.enterprise.context.SessionScoped; import javax.enterprise.event.Observes; @@ -46,8 +47,6 @@ import javax.faces.context.FacesContext; import javax.inject.Inject; import javax.servlet.http.HttpSession; -import org.slf4j.Logger; - import br.gov.frameworkdemoiselle.annotation.Name; import br.gov.frameworkdemoiselle.configuration.ConfigurationException; import br.gov.frameworkdemoiselle.internal.configuration.JsfSecurityConfig; @@ -71,7 +70,7 @@ public class SecurityObserver implements Serializable { @Inject private Logger logger; - + @Inject @Name("demoiselle-jsf-bundle") private ResourceBundle bundle; @@ -113,7 +112,7 @@ public class SecurityObserver implements Serializable { Redirector.redirect(getConfig().getLoginPage()); } catch (PageNotFoundException cause) { - throw new ConfigurationException( bundle.getString("login-page-not-found",cause.getViewId()) , cause); + throw new ConfigurationException(bundle.getString("login-page-not-found", cause.getViewId()), cause); } } @@ -131,7 +130,8 @@ public class SecurityObserver implements Serializable { } catch (PageNotFoundException cause) { if (redirectedFromConfig) { - throw new ConfigurationException( bundle.getString("after-login-page-not-found",cause.getViewId()) , cause); + throw new ConfigurationException(bundle.getString("after-login-page-not-found", cause.getViewId()), + cause); } else { throw cause; } @@ -148,14 +148,15 @@ public class SecurityObserver implements Serializable { } } catch (PageNotFoundException cause) { - throw new ConfigurationException( bundle.getString("after-logout-page-not-found",cause.getViewId()) , cause); + throw new ConfigurationException(bundle.getString("after-logout-page-not-found", cause.getViewId()), cause); } finally { try { - HttpSession session = (HttpSession)FacesContext.getCurrentInstance().getExternalContext().getSession(false); + HttpSession session = (HttpSession) FacesContext.getCurrentInstance().getExternalContext() + .getSession(false); session.invalidate(); } catch (IllegalStateException e) { - logger.debug("Esta sessão já foi invalidada."); + logger.fine("Esta sessão já foi invalidada."); } } } -- libgit2 0.21.2