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 2011/03/10 22:55:32 UTC
svn commit: r1080369 - in
/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl:
./ config/ logging/ projectstage/ scope/conversation/spi/ spi/
Author: gpetracek
Date: Thu Mar 10 21:55:31 2011
New Revision: 1080369
URL: http://svn.apache.org/viewvc?rev=1080369&view=rev
Log:
EXTCDI-151 improved javadoc and cleanup
Modified:
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CodiDeactivatorExtension.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/AbstractConfiguredValueResolver.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/LocalJndiResolver.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/ServiceLoaderResolver.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/SystemPropertyResolver.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLogger.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageActivationExtension.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/BeanEntryFactory.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/WindowContextManager.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/spi/InterceptorStrategy.java
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CodiDeactivatorExtension.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CodiDeactivatorExtension.java?rev=1080369&r1=1080368&r2=1080369&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CodiDeactivatorExtension.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CodiDeactivatorExtension.java Thu Mar 10 21:55:31 2011
@@ -34,6 +34,10 @@ import javax.interceptor.Interceptor;
*/
public class CodiDeactivatorExtension implements Extension, Deactivatable
{
+ /**
+ * TODO re-visit if we still need it
+ * @param processAnnotatedType current process-annotated-type
+ */
public void filterInterceptors(@Observes ProcessAnnotatedType processAnnotatedType)
{
if(!isActivated())
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java?rev=1080369&r1=1080368&r2=1080369&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java Thu Mar 10 21:55:31 2011
@@ -181,7 +181,7 @@ public class CoreStartupObserver extends
}
- public String getCodiCoreInformation()
+ private String getCodiCoreInformation()
{
String version = CodiInformation.VERSION;
String revision;
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/AbstractConfiguredValueResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/AbstractConfiguredValueResolver.java?rev=1080369&r1=1080368&r2=1080369&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/AbstractConfiguredValueResolver.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/AbstractConfiguredValueResolver.java Thu Mar 10 21:55:31 2011
@@ -88,6 +88,9 @@ public abstract class AbstractConfigured
return (List<T>)this.configuredValues;
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isActivated()
{
return !deactivated;
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/LocalJndiResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/LocalJndiResolver.java?rev=1080369&r1=1080368&r2=1080369&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/LocalJndiResolver.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/LocalJndiResolver.java Thu Mar 10 21:55:31 2011
@@ -36,6 +36,9 @@ public class LocalJndiResolver extends A
{
private static final String BASE_NAME = "java:comp/env/myfaces-codi/";
+ /**
+ * {@inheritDoc}
+ */
public <K, T> List<T> resolveInstances(ConfiguredValueDescriptor<K, T> descriptor)
{
String key;
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/ServiceLoaderResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/ServiceLoaderResolver.java?rev=1080369&r1=1080368&r2=1080369&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/ServiceLoaderResolver.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/ServiceLoaderResolver.java Thu Mar 10 21:55:31 2011
@@ -35,6 +35,9 @@ import java.lang.reflect.Modifier;
@InvocationOrder(200)
public class ServiceLoaderResolver extends AbstractConfiguredValueResolver
{
+ /**
+ * {@inheritDoc}
+ */
public <K, T> List<T> resolveInstances(ConfiguredValueDescriptor<K, T> descriptor)
{
List<T> result = new ArrayList<T>();
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/SystemPropertyResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/SystemPropertyResolver.java?rev=1080369&r1=1080368&r2=1080369&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/SystemPropertyResolver.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/SystemPropertyResolver.java Thu Mar 10 21:55:31 2011
@@ -34,7 +34,10 @@ import java.util.Collections;
public class SystemPropertyResolver extends AbstractConfiguredValueResolver
{
private static final String BASE_NAME = "org.apache.myfaces.extensions.cdi.";
-
+
+ /**
+ * {@inheritDoc}
+ */
public <K, T> List<T> resolveInstances(ConfiguredValueDescriptor<K, T> descriptor)
{
String key = "" + descriptor.getKey();
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLogger.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLogger.java?rev=1080369&r1=1080368&r2=1080369&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLogger.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLogger.java Thu Mar 10 21:55:31 2011
@@ -76,6 +76,9 @@ public class DefaultLogger implements Lo
return !(!this.anonymous && this.loggerName == null && this.resourceBundleName == null);
}
+ /**
+ * {@inheritDoc}
+ */
public java.util.logging.Logger getWrapped()
{
if(this.wrapped == null)
@@ -85,31 +88,49 @@ public class DefaultLogger implements Lo
return this.wrapped;
}
+ /**
+ * {@inheritDoc}
+ */
public ResourceBundle getResourceBundle()
{
return getWrapped().getResourceBundle();
}
+ /**
+ * {@inheritDoc}
+ */
public String getResourceBundleName()
{
return getWrapped().getResourceBundleName();
}
+ /**
+ * {@inheritDoc}
+ */
public void setFilter(Filter filter)
{
getWrapped().setFilter(filter);
}
+ /**
+ * {@inheritDoc}
+ */
public Filter getFilter()
{
return getWrapped().getFilter();
}
+ /**
+ * {@inheritDoc}
+ */
public void log(LogRecord logRecord)
{
getWrapped().log(logRecord);
}
+ /**
+ * {@inheritDoc}
+ */
public void log(Level level, String s)
{
if(!isLoggable(level))
@@ -119,6 +140,9 @@ public class DefaultLogger implements Lo
getWrapped().logp(level, this.loggerName, getMethodName(), s);
}
+ /**
+ * {@inheritDoc}
+ */
public void log(Level level, String s, Object o)
{
if(!isLoggable(level))
@@ -128,6 +152,9 @@ public class DefaultLogger implements Lo
getWrapped().logp(level, this.loggerName, getMethodName(), s, o);
}
+ /**
+ * {@inheritDoc}
+ */
public void log(Level level, String s, Object[] objects)
{
if(!isLoggable(level))
@@ -137,6 +164,9 @@ public class DefaultLogger implements Lo
getWrapped().logp(level, this.loggerName, getMethodName(), s, objects);
}
+ /**
+ * {@inheritDoc}
+ */
public void log(Level level, String s, Throwable throwable)
{
if(!isLoggable(level))
@@ -146,76 +176,121 @@ public class DefaultLogger implements Lo
getWrapped().logp(level, this.loggerName, getMethodName(), s, throwable);
}
+ /**
+ * {@inheritDoc}
+ */
public void logp(Level level, String s, String s1, String s2)
{
getWrapped().logp(level, s, s1, s2);
}
+ /**
+ * {@inheritDoc}
+ */
public void logp(Level level, String s, String s1, String s2, Object o)
{
getWrapped().logp(level, s, s1, s2, o);
}
+ /**
+ * {@inheritDoc}
+ */
public void logp(Level level, String s, String s1, String s2, Object[] objects)
{
getWrapped().logp(level, s, s1, s2, objects);
}
+ /**
+ * {@inheritDoc}
+ */
public void logp(Level level, String s, String s1, String s2, Throwable throwable)
{
getWrapped().logp(level, s, s1, s2, throwable);
}
+ /**
+ * {@inheritDoc}
+ */
public void logrb(Level level, String s, String s1, String s2, String s3)
{
getWrapped().logrb(level, s, s1, s2, s3);
}
+ /**
+ * {@inheritDoc}
+ */
public void logrb(Level level, String s, String s1, String s2, String s3, Object o)
{
getWrapped().logrb(level, s, s1, s2, s3, o);
}
+ /**
+ * {@inheritDoc}
+ */
public void logrb(Level level, String s, String s1, String s2, String s3, Object[] objects)
{
getWrapped().logrb(level, s, s1, s2, s3, objects);
}
+ /**
+ * {@inheritDoc}
+ */
public void logrb(Level level, String s, String s1, String s2, String s3, Throwable throwable)
{
getWrapped().logrb(level, s, s1, s2, s3, throwable);
}
+ /**
+ * {@inheritDoc}
+ */
public void entering(String s, String s1)
{
getWrapped().entering(s, s1);
}
+ /**
+ * {@inheritDoc}
+ */
public void entering(String s, String s1, Object o)
{
getWrapped().entering(s, s1, o);
}
+ /**
+ * {@inheritDoc}
+ */
public void entering(String s, String s1, Object[] objects)
{
getWrapped().entering(s, s1, objects);
}
+ /**
+ * {@inheritDoc}
+ */
public void exiting(String s, String s1)
{
getWrapped().exiting(s, s1);
}
+ /**
+ * {@inheritDoc}
+ */
public void exiting(String s, String s1, Object o)
{
getWrapped().exiting(s, s1, o);
}
+ /**
+ * {@inheritDoc}
+ */
public void throwing(String s, String s1, Throwable throwable)
{
getWrapped().throwing(s, s1, throwable);
}
+ /**
+ * {@inheritDoc}
+ */
public void severe(String s)
{
if(!isLoggable(Level.SEVERE))
@@ -225,6 +300,9 @@ public class DefaultLogger implements Lo
getWrapped().logp(Level.SEVERE, this.loggerName, getMethodName(), s);
}
+ /**
+ * {@inheritDoc}
+ */
public void warning(String s)
{
if(!isLoggable(Level.WARNING))
@@ -234,6 +312,9 @@ public class DefaultLogger implements Lo
getWrapped().logp(Level.WARNING, this.loggerName, getMethodName(), s);
}
+ /**
+ * {@inheritDoc}
+ */
public void info(String s)
{
if(!isLoggable(Level.INFO))
@@ -243,11 +324,17 @@ public class DefaultLogger implements Lo
getWrapped().logp(Level.INFO, this.loggerName, getMethodName(), s);
}
+ /**
+ * {@inheritDoc}
+ */
public void config(String s)
{
getWrapped().config(s);
}
+ /**
+ * {@inheritDoc}
+ */
public void fine(String s)
{
if(!isLoggable(Level.FINE))
@@ -257,6 +344,9 @@ public class DefaultLogger implements Lo
getWrapped().logp(Level.FINE, this.loggerName, getMethodName(), s);
}
+ /**
+ * {@inheritDoc}
+ */
public void finer(String s)
{
if(!isLoggable(Level.FINER))
@@ -266,6 +356,9 @@ public class DefaultLogger implements Lo
getWrapped().logp(Level.FINER, this.loggerName, getMethodName(), s);
}
+ /**
+ * {@inheritDoc}
+ */
public void finest(String s)
{
if(!isLoggable(Level.FINEST))
@@ -275,61 +368,97 @@ public class DefaultLogger implements Lo
getWrapped().logp(Level.FINEST, this.loggerName, getMethodName(), s);
}
+ /**
+ * {@inheritDoc}
+ */
public void setLevel(Level level)
{
getWrapped().setLevel(level);
}
+ /**
+ * {@inheritDoc}
+ */
public Level getLevel()
{
return getWrapped().getLevel();
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isLoggable(Level level)
{
return getWrapped().isLoggable(level);
}
+ /**
+ * {@inheritDoc}
+ */
public String getName()
{
return getWrapped().getName();
}
+ /**
+ * {@inheritDoc}
+ */
public void addHandler(Handler handler)
{
getWrapped().addHandler(handler);
}
+ /**
+ * {@inheritDoc}
+ */
public void removeHandler(Handler handler)
{
getWrapped().removeHandler(handler);
}
+ /**
+ * {@inheritDoc}
+ */
public Handler[] getHandlers()
{
return getWrapped().getHandlers();
}
+ /**
+ * {@inheritDoc}
+ */
public void setUseParentHandlers(boolean b)
{
getWrapped().setUseParentHandlers(b);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean getUseParentHandlers()
{
return getWrapped().getUseParentHandlers();
}
+ /**
+ * {@inheritDoc}
+ */
public java.util.logging.Logger getParent()
{
return getWrapped().getParent();
}
+ /**
+ * {@inheritDoc}
+ */
public void setParent(java.util.logging.Logger logger)
{
getWrapped().setParent(logger);
}
+ /**
+ * {@inheritDoc}
+ */
public Factory getFactory()
{
return new DefaultLoggerFactory();
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageActivationExtension.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageActivationExtension.java?rev=1080369&r1=1080368&r2=1080369&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageActivationExtension.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageActivationExtension.java Thu Mar 10 21:55:31 2011
@@ -91,6 +91,9 @@ public class ProjectStageActivationExten
return false;
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isActivated()
{
return ClassDeactivation.isClassActivated(getClass());
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/BeanEntryFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/BeanEntryFactory.java?rev=1080369&r1=1080368&r2=1080369&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/BeanEntryFactory.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/BeanEntryFactory.java Thu Mar 10 21:55:31 2011
@@ -26,6 +26,21 @@ import javax.enterprise.context.spi.Crea
*/
public interface BeanEntryFactory
{
+ /**
+ * Creates a new {@link BeanEntry} which will be used for storing all data needed for creating and managing
+ * a scoped bean
+ *
+ * @param bean current bean
+ * @param creationalContext context for the current bean
+ * @param scopeBeanEventEnabled flag which indicates if the
+ * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.event.ScopeBeanEvent} should be fired
+ * @param accessBeanEventEnabled flag which indicates if the
+ * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.event.AccessBeanEvent} should be fired
+ * @param unscopeBeanEventEnabled flag which indicates if the
+ * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.event.UnscopeBeanEvent} should be fired
+ * @param <T> current type
+ * @return entry which will be stored by one of the CODI scopes
+ */
<T> BeanEntry<T> createBeanEntry(Bean<T> bean,
CreationalContext<T> creationalContext,
boolean scopeBeanEventEnabled,
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/WindowContextManager.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/WindowContextManager.java?rev=1080369&r1=1080368&r2=1080369&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/WindowContextManager.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/WindowContextManager.java Thu Mar 10 21:55:31 2011
@@ -27,11 +27,27 @@ import java.io.Serializable;
*/
public interface WindowContextManager extends Serializable
{
+ /**
+ * Key for storing the window-id e.g. in URLs
+ */
String WINDOW_CONTEXT_ID_PARAMETER_KEY = "windowId";
+ /**
+ * Value which can be used as "window-id" by external clients which aren't aware of windows.
+ * It deactivates e.g. the redirect for the initial request.
+ */
String AUTOMATED_ENTRY_POINT_PARAMETER_KEY = "automatedEntryPoint";
+ /**
+ * Resolves the current {@link WindowContext}
+ * @return current window-context
+ */
WindowContext getCurrentWindowContext();
+ /**
+ * Resolves the {@link WindowContext} for the given window-id
+ * @param windowContextId window-id
+ * @return window-context of the given window-id
+ */
WindowContext getWindowContext(String windowContextId);
}
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/spi/InterceptorStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/spi/InterceptorStrategy.java?rev=1080369&r1=1080368&r2=1080369&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/spi/InterceptorStrategy.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/spi/InterceptorStrategy.java Thu Mar 10 21:55:31 2011
@@ -28,5 +28,11 @@ import java.io.Serializable;
*/
public interface InterceptorStrategy extends Serializable
{
+ /**
+ * Method which will be invoked by the interceptor method annotated with {@link javax.interceptor.AroundInvoke}
+ * @param invocationContext current invocation-context
+ * @return result of the intercepted method
+ * @throws Exception exception which might be thrown by the intercepted method
+ */
Object execute(InvocationContext invocationContext) throws Exception;
}