From c57c2964f49613e2f5461a4fde0f2a0b978079f4 Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Thu, 27 Jun 2013 17:40:34 -0300 Subject: [PATCH] Criação da estratégia de conversão das mensagens do MessageContext em mensagens específicas da camada de apresentação --- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ConfigurationBootstrap.java | 2 +- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConsoleMessageAppender.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageAppender.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++ impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImpl.java | 9 ++++++++- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImpl.java | 8 ++------ impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/StrategySelector.java | 25 ++++++++++++++++++++++--- impl/core/src/test/java/message/MessageContextTest.java | 19 +++++++++---------- impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/FacesMessageAppender.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessagePhaseListener.java | 92 -------------------------------------------------------------------------------------------- impl/extension/jsf/src/main/resources/META-INF/faces-config.xml | 4 ---- impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessagePhaseListenerTest.java | 115 ------------------------------------------------------------------------------------------------------------------- impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/InternalProcessorFilterImpl.java | 4 +++- 12 files changed, 196 insertions(+), 233 deletions(-) create mode 100644 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConsoleMessageAppender.java create mode 100644 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageAppender.java create mode 100644 impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/FacesMessageAppender.java delete mode 100644 impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessagePhaseListener.java delete mode 100644 impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessagePhaseListenerTest.java diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ConfigurationBootstrap.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ConfigurationBootstrap.java index a817acd..55b43b7 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ConfigurationBootstrap.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ConfigurationBootstrap.java @@ -139,7 +139,7 @@ public class ConfigurationBootstrap extends AbstractStrategyBootstrap + * or write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301, USA. + * ---------------------------------------------------------------------------- + * Este arquivo é parte do Framework Demoiselle. + * + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação + * do Software Livre (FSF). + * + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português + * para maiores detalhes. + * + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título + * "LICENCA.txt", junto com esse programa. Se não, acesse + * ou escreva para a Fundação do Software Livre (FSF) Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + */ +package br.gov.frameworkdemoiselle.internal.implementation; + +import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.CORE_PRIORITY; +import br.gov.frameworkdemoiselle.annotation.Priority; +import br.gov.frameworkdemoiselle.message.Message; + +@Priority(CORE_PRIORITY) +public class ConsoleMessageAppender implements MessageAppender { + + private static final long serialVersionUID = 1L; + + @Override + public void append(Message message) { + System.out.println(message.getText()); + } +} diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageAppender.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageAppender.java new file mode 100644 index 0000000..c325949 --- /dev/null +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageAppender.java @@ -0,0 +1,46 @@ +/* + * Demoiselle Framework + * Copyright (C) 2010 SERPRO + * ---------------------------------------------------------------------------- + * This file is part of Demoiselle Framework. + * + * Demoiselle Framework is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License version 3 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License version 3 + * along with this program; if not, see + * or write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301, USA. + * ---------------------------------------------------------------------------- + * Este arquivo é parte do Framework Demoiselle. + * + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação + * do Software Livre (FSF). + * + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português + * para maiores detalhes. + * + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título + * "LICENCA.txt", junto com esse programa. Se não, acesse + * ou escreva para a Fundação do Software Livre (FSF) Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + */ +package br.gov.frameworkdemoiselle.internal.implementation; + +import java.io.Serializable; + +import br.gov.frameworkdemoiselle.message.Message; + +public interface MessageAppender extends Serializable { + + void append(Message message); +} diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImpl.java index 8142c78..898aa10 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImpl.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImpl.java @@ -50,6 +50,7 @@ import br.gov.frameworkdemoiselle.message.DefaultMessage; import br.gov.frameworkdemoiselle.message.Message; import br.gov.frameworkdemoiselle.message.MessageContext; import br.gov.frameworkdemoiselle.message.SeverityType; +import br.gov.frameworkdemoiselle.util.Beans; import br.gov.frameworkdemoiselle.util.ResourceBundle; /** @@ -79,7 +80,13 @@ public class MessageContextImpl implements Serializable, MessageContext { } getLogger().debug(getBundle().getString("adding-message-to-context", message.toString())); - messages.add(aux); + getAppender().append(aux); + } + + private MessageAppender getAppender() { + Class appenderClass = StrategySelector.selectClass(MessageAppender.class); + + return Beans.getReference(appenderClass); } @Override diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImpl.java index 2bc2afa..3458c1c 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImpl.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityContextImpl.java @@ -42,8 +42,6 @@ import java.security.Principal; import javax.inject.Named; import br.gov.frameworkdemoiselle.DemoiselleException; -import br.gov.frameworkdemoiselle.internal.bootstrap.AuthenticatorBootstrap; -import br.gov.frameworkdemoiselle.internal.bootstrap.AuthorizerBootstrap; import br.gov.frameworkdemoiselle.internal.configuration.SecurityConfig; import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; import br.gov.frameworkdemoiselle.security.AfterLoginSuccessful; @@ -74,11 +72,10 @@ public class SecurityContextImpl implements SecurityContext { private Authenticator getAuthenticator() { if (this.authenticator == null) { - AuthenticatorBootstrap bootstrap = Beans.getReference(AuthenticatorBootstrap.class); Class clazz = getConfig().getAuthenticatorClass(); if (clazz == null) { - clazz = StrategySelector.selectClass(Authenticator.class, bootstrap.getCache()); + clazz = StrategySelector.selectClass(Authenticator.class); } this.authenticator = Beans.getReference(clazz); @@ -89,11 +86,10 @@ public class SecurityContextImpl implements SecurityContext { private Authorizer getAuthorizer() { if (this.authorizer == null) { - AuthorizerBootstrap bootstrap = Beans.getReference(AuthorizerBootstrap.class); Class clazz = getConfig().getAuthorizerClass(); if (clazz == null) { - clazz = StrategySelector.selectClass(Authorizer.class, bootstrap.getCache()); + clazz = StrategySelector.selectClass(Authorizer.class); } this.authorizer = Beans.getReference(clazz); diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/StrategySelector.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/StrategySelector.java index 5597558..5df5c1e 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/StrategySelector.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/StrategySelector.java @@ -42,14 +42,18 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import javax.enterprise.inject.AmbiguousResolutionException; +import javax.enterprise.inject.spi.Bean; import br.gov.frameworkdemoiselle.DemoiselleException; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; +import br.gov.frameworkdemoiselle.util.Beans; import br.gov.frameworkdemoiselle.util.ResourceBundle; public final class StrategySelector implements Serializable { @@ -92,7 +96,7 @@ public final class StrategySelector implements Serializable { return map.get(elected); } - public static Class selectClass(Class type, Collection> options) { + private static Class selectClass(Class type, Collection> options) { Class selected = null; for (Class option : options) { @@ -102,13 +106,28 @@ public final class StrategySelector implements Serializable { } if (selected != null) { - checkForAmbiguity(type, selected, options); + performAmbiguityCheck(type, selected, options); } return selected; } - private static void checkForAmbiguity(Class type, Class selected, + public static Class selectClass(Class type) { + return selectClass(type, getOptions(type)); + } + + @SuppressWarnings("unchecked") + private static Collection> getOptions(Class type) { + Set> result = new HashSet>(); + + for (Bean bean : Beans.getBeanManager().getBeans(type)) { + result.add((Class) bean.getBeanClass()); + } + + return result; + } + + private static void performAmbiguityCheck(Class type, Class selected, Collection> options) { int selectedPriority = getPriority(selected); diff --git a/impl/core/src/test/java/message/MessageContextTest.java b/impl/core/src/test/java/message/MessageContextTest.java index 9ad8b38..17272ff 100644 --- a/impl/core/src/test/java/message/MessageContextTest.java +++ b/impl/core/src/test/java/message/MessageContextTest.java @@ -14,7 +14,6 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; -import resourcebundle.parameter.ResourceBundleWithParameter; import test.Tests; import br.gov.frameworkdemoiselle.internal.context.ContextManager; import br.gov.frameworkdemoiselle.internal.context.ManagedContext; @@ -34,7 +33,7 @@ public class MessageContextTest { private MessageWithResourceBundle bundleCustom; private static final String PATH = "src/test/resources/message/"; - + @Deployment public static JavaArchive createDeployment() { JavaArchive deployment = Tests.createDeployment(MessageContextTest.class); @@ -78,7 +77,7 @@ public class MessageContextTest { assertEquals(messageContext.getMessages().get(0).getSeverity(), SeverityType.WARN); ContextManager.deactivate(ManagedContext.class, RequestScoped.class); } - + @Test public void testAddMessageWitSeverityErro() { ContextManager.activate(ManagedContext.class, RequestScoped.class); @@ -87,7 +86,7 @@ public class MessageContextTest { assertEquals(messageContext.getMessages().get(0).getSeverity(), SeverityType.ERROR); ContextManager.deactivate(ManagedContext.class, RequestScoped.class); } - + @Test public void testCleanMessageContext() { ContextManager.activate(ManagedContext.class, RequestScoped.class); @@ -107,7 +106,7 @@ public class MessageContextTest { assertTrue(messageContext.getMessages().get(0).getText().equals("Message with 1 param")); ContextManager.deactivate(ManagedContext.class, RequestScoped.class); } - + @Test public void testMessageWithResourceBundle() { bundleCustom = Beans.getReference(MessageWithResourceBundle.class); @@ -115,9 +114,9 @@ public class MessageContextTest { String value = bundleCustom.getBundle().getString("MESSAGE_WITHOUT_PARAMETER"); Assert.assertEquals(expected, value); } - + @Test - public void testMessageParsedText(){ + public void testMessageParsedText() { ContextManager.activate(ManagedContext.class, RequestScoped.class); Message MESSAGE_PARSED = new DefaultMessage("{MESSAGE_PARSED}"); String expected = "Message parsed"; @@ -125,9 +124,9 @@ public class MessageContextTest { Assert.assertEquals(expected, value); ContextManager.deactivate(ManagedContext.class, RequestScoped.class); } - + @Test - public void testMessageIsNull(){ + public void testMessageIsNull() { ContextManager.activate(ManagedContext.class, RequestScoped.class); Message NULL_MESSAGE = new DefaultMessage(null); String expected = null; @@ -135,5 +134,5 @@ public class MessageContextTest { Assert.assertEquals(expected, value); ContextManager.deactivate(ManagedContext.class, RequestScoped.class); } - + } diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/FacesMessageAppender.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/FacesMessageAppender.java new file mode 100644 index 0000000..c060fa9 --- /dev/null +++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/FacesMessageAppender.java @@ -0,0 +1,53 @@ +/* + * Demoiselle Framework + * Copyright (C) 2010 SERPRO + * ---------------------------------------------------------------------------- + * This file is part of Demoiselle Framework. + * + * Demoiselle Framework is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License version 3 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License version 3 + * along with this program; if not, see + * or write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301, USA. + * ---------------------------------------------------------------------------- + * Este arquivo é parte do Framework Demoiselle. + * + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação + * do Software Livre (FSF). + * + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português + * para maiores detalhes. + * + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título + * "LICENCA.txt", junto com esse programa. Se não, acesse + * ou escreva para a Fundação do Software Livre (FSF) Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + */ +package br.gov.frameworkdemoiselle.internal.implementation; + +import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L2_PRIORITY; +import br.gov.frameworkdemoiselle.annotation.Priority; +import br.gov.frameworkdemoiselle.message.Message; +import br.gov.frameworkdemoiselle.util.Faces; + +@Priority(EXTENSIONS_L2_PRIORITY) +public class FacesMessageAppender implements MessageAppender { + + private static final long serialVersionUID = 1L; + + @Override + public void append(Message message) { + Faces.addMessage(message); + } +} diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessagePhaseListener.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessagePhaseListener.java deleted file mode 100644 index 475193c..0000000 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessagePhaseListener.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Demoiselle Framework - * Copyright (C) 2010 SERPRO - * ---------------------------------------------------------------------------- - * This file is part of Demoiselle Framework. - * - * Demoiselle Framework is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License version 3 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License version 3 - * along with this program; if not, see - * or write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301, USA. - * ---------------------------------------------------------------------------- - * Este arquivo é parte do Framework Demoiselle. - * - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação - * do Software Livre (FSF). - * - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português - * para maiores detalhes. - * - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título - * "LICENCA.txt", junto com esse programa. Se não, acesse - * ou escreva para a Fundação do Software Livre (FSF) Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. - */ -package br.gov.frameworkdemoiselle.internal.implementation; - -import javax.faces.event.PhaseEvent; -import javax.faces.event.PhaseId; -import javax.faces.event.PhaseListener; - -import org.slf4j.Logger; - -import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer; -import br.gov.frameworkdemoiselle.message.MessageContext; -import br.gov.frameworkdemoiselle.util.Beans; -import br.gov.frameworkdemoiselle.util.Faces; - -/** - * This class is a JSF phase listener intended to transfer messages from Demoiselle Context to JSF own context. - * - * @author SERPRO - */ -public class MessagePhaseListener implements PhaseListener { - - private static final long serialVersionUID = 1L; - - private final Logger logger = LoggerProducer.create(this.getClass()); - - public void beforePhase(PhaseEvent e) { - transferMessages(e); - } - - public void afterPhase(PhaseEvent e) { - } - - /** - * Transfers messages from a context to another. - * - * @param e - * PhaseEvent - */ - private void transferMessages(PhaseEvent e) { - - logger.debug(this.getClass().getSimpleName() + " " + e.getPhaseId()); - - MessageContext messageContext = Beans.getReference(MessageContext.class); - - // TODO: usar o bundle nas mensagens de log - logger.debug("Moving " + messageContext.getMessages().size() - + " message(s) from MessageContext to FacesContext."); - - Faces.addMessages(messageContext.getMessages()); - messageContext.clear(); - } - - public PhaseId getPhaseId() { - return PhaseId.RENDER_RESPONSE; - } - -} diff --git a/impl/extension/jsf/src/main/resources/META-INF/faces-config.xml b/impl/extension/jsf/src/main/resources/META-INF/faces-config.xml index a753941..e853852 100644 --- a/impl/extension/jsf/src/main/resources/META-INF/faces-config.xml +++ b/impl/extension/jsf/src/main/resources/META-INF/faces-config.xml @@ -37,10 +37,6 @@ - - br.gov.frameworkdemoiselle.internal.implementation.MessagePhaseListener - - br.gov.frameworkdemoiselle.internal.implementation.AuthenticationExceptionHandlerFactory br.gov.frameworkdemoiselle.internal.implementation.AuthorizationExceptionHandlerFactory diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessagePhaseListenerTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessagePhaseListenerTest.java deleted file mode 100644 index a35e1f2..0000000 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/MessagePhaseListenerTest.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Demoiselle Framework - * Copyright (C) 2010 SERPRO - * ---------------------------------------------------------------------------- - * This file is part of Demoiselle Framework. - * - * Demoiselle Framework is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License version 3 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License version 3 - * along with this program; if not, see - * or write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301, USA. - * ---------------------------------------------------------------------------- - * Este arquivo é parte do Framework Demoiselle. - * - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação - * do Software Livre (FSF). - * - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português - * para maiores detalhes. - * - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título - * "LICENCA.txt", junto com esse programa. Se não, acesse - * ou escreva para a Fundação do Software Livre (FSF) Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. - */ -package br.gov.frameworkdemoiselle.internal.implementation; - -import static org.easymock.EasyMock.expect; -import static org.powermock.api.easymock.PowerMock.mockStatic; -import static org.powermock.api.easymock.PowerMock.replayAll; -import static org.powermock.api.easymock.PowerMock.verifyAll; - -import java.util.ArrayList; -import java.util.List; - -import javax.faces.event.PhaseEvent; -import javax.faces.event.PhaseId; - -import org.easymock.EasyMock; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.api.easymock.PowerMock; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.slf4j.Logger; - -import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer; -import br.gov.frameworkdemoiselle.message.Message; -import br.gov.frameworkdemoiselle.message.MessageContext; -import br.gov.frameworkdemoiselle.util.Beans; -import br.gov.frameworkdemoiselle.util.Faces; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ LoggerProducer.class, Beans.class, Faces.class }) -public class MessagePhaseListenerTest { - - private MessagePhaseListener m; - - private Logger logger; - - @Before - public void before() { - PowerMock.mockStatic(LoggerProducer.class); - logger = PowerMock.createMock(Logger.class); - expect(LoggerProducer.create(MessagePhaseListener.class)).andReturn(logger); - } - - @Test - public void testGetPhaseId() { - m = new MessagePhaseListener(); - Assert.assertEquals(PhaseId.RENDER_RESPONSE, m.getPhaseId()); - } - - @Test - public void testBeforePhase() { - - mockStatic(Beans.class); - mockStatic(Faces.class); - - PhaseEvent event = PowerMock.createMock(PhaseEvent.class); - MessageContext mc = PowerMock.createMock(MessageContext.class); - - logger.debug(EasyMock.anyObject(String.class)); - logger.debug(EasyMock.anyObject(String.class)); - - List list = new ArrayList(); - - expect(event.getPhaseId()).andReturn(PhaseId.RENDER_RESPONSE); - expect(Beans.getReference(MessageContext.class)).andReturn(mc); - expect(mc.getMessages()).andReturn(list).anyTimes(); - - mc.clear(); - Faces.addMessages(list); - - replayAll(); - m = new MessagePhaseListener(); - m.beforePhase(event); - m.afterPhase(event); - verifyAll(); - } - -} diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/InternalProcessorFilterImpl.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/InternalProcessorFilterImpl.java index 542bb60..fc4b77f 100644 --- a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/InternalProcessorFilterImpl.java +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/InternalProcessorFilterImpl.java @@ -24,7 +24,9 @@ public class InternalProcessorFilterImpl implements InternalProcessorFilter { filters.add(new HttpServletRequestProducerFilter()); filters.add(new HttpServletResponseProducerFilter()); - filters.add(new BasicAuthenticationFilter()); + + // TODO Analizar o uso do BasicAuthenticationFilter + // filters.add(new BasicAuthenticationFilter()); } @Override -- libgit2 0.21.2