You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/05/11 21:50:58 UTC
svn commit: r943248 - in /myfaces/extensions/cdi/trunk:
jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/
jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/
j...
Author: gpetracek
Date: Tue May 11 19:50:57 2010
New Revision: 943248
URL: http://svn.apache.org/viewvc?rev=943248&view=rev
Log:
[EXTCDI-21] minor refactoring
Added:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/JsfAwareMessageContextProducer.java
- copied, changed from r942912, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/JsfAwareMessageContext.java
Removed:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/JsfAwareMessageContext.java
Modified:
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContext.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AbstractTest.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ExtensibilityTest.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/SimpleMessageTest.java
Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/JsfAwareMessageContextProducer.java (from r942912, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/JsfAwareMessageContext.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/JsfAwareMessageContextProducer.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/JsfAwareMessageContextProducer.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/JsfAwareMessageContext.java&r1=942912&r2=943248&rev=943248&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/JsfAwareMessageContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/message/JsfAwareMessageContextProducer.java Tue May 11 19:50:57 2010
@@ -19,74 +19,59 @@
package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.message;
import org.apache.myfaces.extensions.cdi.javaee.jsf.api.qualifier.Jsf;
-import org.apache.myfaces.extensions.cdi.message.api.Message;
+import org.apache.myfaces.extensions.cdi.message.api.LocaleResolver;
import org.apache.myfaces.extensions.cdi.message.api.MessageContext;
-import org.apache.myfaces.extensions.cdi.message.api.MessageContextConfig;
import org.apache.myfaces.extensions.cdi.message.api.MessageFactory;
-import org.apache.myfaces.extensions.cdi.message.api.LocaleResolver;
-import org.apache.myfaces.extensions.cdi.message.api.MessageFilter;
-import org.apache.myfaces.extensions.cdi.message.api.MessageBuilder;
import org.apache.myfaces.extensions.cdi.message.impl.DefaultMessageContext;
import org.apache.myfaces.extensions.cdi.message.impl.spi.ELProvider;
-import javax.inject.Named;
-import javax.inject.Inject;
-import javax.annotation.PostConstruct;
-import javax.faces.context.FacesContext;
import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.Produces;
+import javax.faces.context.FacesContext;
+import javax.inject.Named;
import java.util.Locale;
-import java.util.Set;
-import java.util.List;
/**
* @author Gerhard Petracek
*/
-@Jsf
-@Named("messageContext")
-@Dependent
-public class JsfAwareMessageContext implements MessageContext
+public class JsfAwareMessageContextProducer
{
- private static final long serialVersionUID = 3497205985879944059L;
-
- @Inject
- private Instance<MessageFactory> messageFactoryInstance;
-
- @Inject
- private Instance<ELProvider> elProviderInstance;
-
- private MessageContext messageContext;
-
- @PostConstruct
- public void init()
+ @Produces
+ @Dependent
+ @Jsf
+ @Named("messageContext")
+ public MessageContext createContext(MessageContext defaultMessageContext,
+ Instance<MessageFactory> messageFactoryInstance,
+ Instance<ELProvider> elProviderInstance)
{
MessageFactory messageFactory = null;
ELProvider elProvider = null;
- if (!this.messageFactoryInstance.isUnsatisfied())
+ if (!messageFactoryInstance.isUnsatisfied())
{
- messageFactory = this.messageFactoryInstance.get();
+ messageFactory = messageFactoryInstance.get();
}
- if(!this.elProviderInstance.isUnsatisfied())
+ if (!elProviderInstance.isUnsatisfied())
{
- elProvider = this.elProviderInstance.get();
+ elProvider = elProviderInstance.get();
}
+ MessageContext result = defaultMessageContext.config()
+ .use()
+ .localeResolver(createJsfAwareLocaleResolver())
+ .messageResolver(new JsfAwareApplicationMessagesMessageResolver())
+ .messageInterpolator(new FacesMessageInterpolator(elProvider))
+ .addMessageHandler(new JsfAwareMessageHandler())
+ .create();
+
if (messageFactory != null)
{
- this.messageContext = new DefaultMessageContext(messageFactory);
- }
- else
- {
- this.messageContext = new DefaultMessageContext();
+ return DefaultMessageContext.create(result.config(), messageFactory);
}
- this.messageContext.config().change()
- .localeResolver(createJsfAwareLocaleResolver())
- .messageResolver(new JsfAwareApplicationMessagesMessageResolver())
- .messageInterpolator(new FacesMessageInterpolator(elProvider))
- .addMessageHandler(new JsfAwareMessageHandler());
+ return result;
}
private LocaleResolver createJsfAwareLocaleResolver()
@@ -105,64 +90,4 @@ public class JsfAwareMessageContext impl
}
};
}
-
- public MessageBuilder message()
- {
- return this.messageContext.message();
- }
-
- public MessageContextConfig config()
- {
- return this.messageContext.config();
- }
-
- public <T extends MessageContext> T typed(Class<T> contextType)
- {
- return this.messageContext.typed(contextType);
- }
-
- public MessageContext cloneContext()
- {
- return this.messageContext.cloneContext();
- }
-
- public void addMessage(Message message)
- {
- this.messageContext.addMessage(message);
- }
-
- public Locale getLocale()
- {
- return this.messageContext.getLocale();
- }
-
- public void addMessage(MessageContext messageContext, Message message)
- {
- this.messageContext.addMessage(messageContext, message);
- }
-
- public void addMessageFilter(MessageFilter... messageFilters)
- {
- this.messageContext.addMessageFilter(messageFilters);
- }
-
- public Set<MessageFilter> getMessageFilters()
- {
- return this.messageContext.getMessageFilters();
- }
-
- public void removeMessage(Message message)
- {
- this.messageContext.removeMessage(message);
- }
-
- public void removeAllMessages()
- {
- this.messageContext.removeAllMessages();
- }
-
- public List<Message> getMessages()
- {
- return this.messageContext.getMessages();
- }
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContext.java?rev=943248&r1=943247&r2=943248&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContext.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContext.java Tue May 11 19:50:57 2010
@@ -42,11 +42,26 @@ public class DefaultMessageContext imple
private MessageContextConfig config = new DefaultMessageContextConfig();
private MessageFactory messageFactory;
- public DefaultMessageContext()
+ protected DefaultMessageContext()
{
}
- public DefaultMessageContext(MessageFactory messageFactory)
+ public static MessageContext create(MessageContextConfig config)
+ {
+ return new DefaultMessageContext(config);
+ }
+
+ public static MessageContext create(MessageFactory messageFactory)
+ {
+ return new DefaultMessageContext(messageFactory);
+ }
+
+ public static MessageContext create(MessageContextConfig config, MessageFactory messageFactory)
+ {
+ return new DefaultMessageContext(config, messageFactory);
+ }
+
+ DefaultMessageContext(MessageFactory messageFactory)
{
this.messageFactory = messageFactory;
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AbstractTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AbstractTest.java?rev=943248&r1=943247&r2=943248&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AbstractTest.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AbstractTest.java Tue May 11 19:50:57 2010
@@ -32,10 +32,11 @@ public abstract class AbstractTest
{
protected MessageContext messageContext;
+ @SuppressWarnings({"serial"})
@Before
public void setupFactory()
{
- this.messageContext = new DefaultMessageContext().config().use()
+ this.messageContext = new DefaultMessageContext(){}.config().use()
.messageResolver(new TestMessageResolver())
.localeResolver(new LocaleResolver()
{
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ExtensibilityTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ExtensibilityTest.java?rev=943248&r1=943247&r2=943248&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ExtensibilityTest.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ExtensibilityTest.java Tue May 11 19:50:57 2010
@@ -72,7 +72,7 @@ public class ExtensibilityTest extends A
@Test
public void newMessageFactoryTestViaMessageContext()
{
- Message message = new DefaultMessageContext(new TestMessageFactory()).message().text("{hello}").create();
+ Message message = DefaultMessageContext.create(new TestMessageFactory()).message().text("{hello}").create();
assertEquals(TestMessage.class, message.getClass());
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/SimpleMessageTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/SimpleMessageTest.java?rev=943248&r1=943247&r2=943248&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/SimpleMessageTest.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/SimpleMessageTest.java Tue May 11 19:50:57 2010
@@ -162,7 +162,7 @@ public class SimpleMessageTest extends A
{
SimpleMessageBuilder.message().text("hello open message").toText();
}
- catch(IllegalStateException e)
+ catch(UnsupportedOperationException e)
{
return;
}