9:11 a.m.
Author: nickarls
Date: 2008-11-28 03:11:35 -0500 (Fri, 28 Nov 2008)
New Revision: 376
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ContextMap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionBeanMap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SimpleBeanMap.java
Log:
javadocs/comments/toStrings
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java
===================================================================
---
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java 2008-11-28
07:51:44 UTC (rev 375)
+++
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java 2008-11-28
08:11:35 UTC (rev 376)
@@ -38,9 +38,14 @@
*/
public abstract class AbstractContext implements Context
{
-
+ // The scope type
private Class<? extends Annotation> scopeType;
+ /**
+ * Constructor
+ *
+ * @param scopeType The scope type
+ */
public AbstractContext(Class<? extends Annotation> scopeType)
{
this.scopeType = scopeType;
@@ -53,6 +58,8 @@
* exists
* @return An instance of the bean
* @throws ContextNotActiveException if the context is not active
+ *
+ * @see javax.webbeans.manager.Context#get(Bean, boolean)
*/
public <T> T get(Bean<T> bean, boolean create)
{
@@ -80,6 +87,8 @@
* Get the scope the context is for
*
* @return The scope type
+ *
+ * @see javax.webbeans.manager.Context#getScopeType()
*/
public Class<? extends Annotation> getScopeType()
{
@@ -90,6 +99,8 @@
* Return true if the context is active
*
* @return The active state
+ *
+ * @see javax.webbeans.manager.Context#isActive()
*/
public boolean isActive()
{
@@ -128,7 +139,7 @@
* @return The actual bean map
*/
protected abstract BeanMap getBeanMap();
-
+
/**
* A method that should return the actual atomic boolean instance
*
@@ -139,10 +150,12 @@
@Override
public String toString()
{
- return
- "Context type: " + getScopeType().getName() +
- "\nActive: " + getActive().toString() +
- "\nBeans: " + getBeanMap().toString();
- }
-
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("AbstractContext:\n");
+ buffer.append("Scope type: " + getScopeType().toString() +
"\n");
+ buffer.append("Active: " + getActive().toString() + "\n");
+ buffer.append(getBeanMap().toString() + "\n");
+ return buffer.toString();
+ }
+
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ContextMap.java
===================================================================
---
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ContextMap.java 2008-11-28
07:51:44 UTC (rev 375)
+++
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ContextMap.java 2008-11-28
08:11:35 UTC (rev 376)
@@ -80,8 +80,7 @@
public String toString()
{
StringBuffer buffer = new StringBuffer();
- buffer.append("Context map\n");
- buffer.append("Known scope types: " + delegate.size() + "\n");
+ buffer.append("Scope type -> context list mappings: " +
delegate.size() + "\n");
int i = 0;
for (Entry<Class<? extends Annotation>, List<Context>> entry :
delegate.entrySet())
{
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java
===================================================================
---
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java 2008-11-28
07:51:44 UTC (rev 375)
+++
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java 2008-11-28
08:11:35 UTC (rev 376)
@@ -37,7 +37,7 @@
}
/**
- * Overriden method always creating a new instance
+ * Overridden method always creating a new instance
*
* @param bean The bean to create
* @param create Should a new one be created
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionBeanMap.java
===================================================================
---
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionBeanMap.java 2008-11-28
07:51:44 UTC (rev 375)
+++
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionBeanMap.java 2008-11-28
08:11:35 UTC (rev 376)
@@ -39,10 +39,19 @@
{
private static LogProvider log = Logging.getLogProvider(SessionBeanMap.class);
+ // The HTTP session to use as backing map
private HttpSession session;
+ // The Web Beans manager
private ManagerImpl manager;
+ // The storage prefix to put before names
private String keyPrefix;
+ /**
+ * Constructor
+ *
+ * @param manager The Web Beans manager
+ * @param keyPrefix The storage names prefix
+ */
public SessionBeanMap(ManagerImpl manager, String keyPrefix)
{
super();
@@ -96,6 +105,8 @@
*
* @param bean The bean to get from the session
* @return An instance of the bean
+ *
+ * @see org.jboss.webbeans.contexts.BeanMap#get(Bean)
*/
@SuppressWarnings("unchecked")
public <T> T get(Bean<? extends T> bean)
@@ -116,6 +127,8 @@
*
* @param bean The bean whose instance to remove.
* @return The instance removed
+ *
+ * @see org.jboss.webbeans.contexts.BeanMap#remove(Bean)
*/
public <T> T remove(Bean<? extends T> bean)
{
@@ -133,6 +146,8 @@
* First, checks that the session is present. Then, iterates over the
* attribute names in the session and removes them if they start with the
* know prefix.
+ *
+ * @see org.jboss.webbeans.contexts.BeanMap#clear()
*/
@SuppressWarnings("unchecked")
public void clear()
@@ -156,6 +171,8 @@
* Finally, returns the list.
*
* @return An Iterable to the beans in the storage
+ *
+ * @see org.jboss.webbeans.contexts.BeanMap#keySet()
*/
@SuppressWarnings("unchecked")
public Iterable<Bean<? extends Object>> keySet()
@@ -187,13 +204,15 @@
*
* @param bean The bean to use as key
* @param instance The bean instance to add
+ *
+ * @see org.jboss.webbeans.contexts.BeanMap#put(Bean, Object)
*/
public <T> void put(Bean<? extends T> bean, T instance)
{
checkSession();
String key = getBeanKey(bean);
session.setAttribute(key, instance);
- log.trace("Stored bean " + bean + " under key " + key + "
in session");
+ log.trace("Stored instance " + instance + " for bean " + bean +
" under key " + key + " in session");
}
@SuppressWarnings("unchecked")
@@ -202,11 +221,12 @@
{
StringBuffer buffer = new StringBuffer();
List<Bean<?>> beans = (List) keySet();
- buffer.append(beans.size() + " found in session\n");
+ buffer.append("Bean -> bean instance mappings in HTTP session: " +
beans.size() + "\n");
+ int i = 0;
for (Bean<?> bean : beans)
{
Object instance = get(bean);
- buffer.append(getBeanKey(bean) + ": " + instance + "\n");
+ buffer.append(++i + " - " + getBeanKey(bean) + ": " +
instance + "\n");
}
return buffer.toString();
}
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SimpleBeanMap.java
===================================================================
---
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SimpleBeanMap.java 2008-11-28
07:51:44 UTC (rev 375)
+++
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SimpleBeanMap.java 2008-11-28
08:11:35 UTC (rev 376)
@@ -17,14 +17,15 @@
package org.jboss.webbeans.contexts;
-import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import javax.webbeans.manager.Bean;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
+
import com.google.common.collect.ForwardingMap;
/**
@@ -34,8 +35,14 @@
*/
public class SimpleBeanMap extends ForwardingMap<Bean<? extends Object>,
Object> implements BeanMap
{
+ private static LogProvider log = Logging.getLogProvider(SimpleBeanMap.class);
+
+ // The backing map
protected Map<Bean<? extends Object>, Object> delegate;
+ /**
+ * Constructor
+ */
public SimpleBeanMap()
{
delegate = new ConcurrentHashMap<Bean<? extends Object>, Object>();
@@ -46,11 +53,15 @@
*
* @param The bean to look for
* @return An instance, if found
+ *
+ * @see org.jboss.webbeans.contexts.BeanMap#get(Bean)
*/
@SuppressWarnings("unchecked")
public <T extends Object> T get(Bean<? extends T> bean)
{
- return (T) super.get(bean);
+ T instance = (T) super.get(bean);
+ log.trace("Searched bean map for " + bean + " and got " +
instance);
+ return instance;
}
/**
@@ -63,31 +74,40 @@
{
return delegate;
}
-
+
/**
* Removed a instance from the map
*
- * @param bean the bean to remove
- * @return The instance removed
+ * @param bean the bean to remove
+ * @return The instance removed
+ *
+ * @see org.jboss.webbeans.contexts.BeanMap#remove(Bean)
*/
@SuppressWarnings("unchecked")
public <T extends Object> T remove(Bean<? extends T> bean)
{
- return (T) super.remove(bean);
+ T instance = (T) super.remove(bean);
+ log.trace("Removed instace " + instance + " for bean " + bean +
" from the bean map");
+ return instance;
}
/**
* Clears the map
+ *
+ * @see org.jboss.webbeans.contexts.BeanMap#clear()
*/
public void clear()
{
delegate.clear();
+ log.trace("Bean map cleared");
}
/**
* Returns the beans contained in the map
*
* @return The beans present
+ *
+ * @see org.jboss.webbeans.contexts.BeanMap#keySet()
*/
public Set<Bean<? extends Object>> keySet()
{
@@ -99,20 +119,24 @@
*
* @param bean The bean
* @param instance the instance
+ *
+ * @see org.jboss.webbeans.contexts.BeanMap#put(Bean, Object)
*/
public <T> void put(Bean<? extends T> bean, T instance)
{
delegate.put(bean, instance);
+ log.trace("Stored instance " + instance + " for bean " + bean +
" in bean map");
}
- @SuppressWarnings("unchecked")
@Override
public String toString()
{
StringBuffer buffer = new StringBuffer();
- buffer.append(delegate.size() + " found in session\n");
- for (Entry<Bean<? extends Object>, Object> entry : delegate.entrySet())
{
- buffer.append(entry.getKey().toString() + ": " +
entry.getValue().toString() + "\n");
+ buffer.append("Bean -> bean instance mappings: " + delegate.size() +
"\n");
+ int i = 0;
+ for (Entry<Bean<? extends Object>, Object> entry :
delegate.entrySet())
+ {
+ buffer.append(++i + " - " + entry.getKey().toString() + ": "
+ entry.getValue().toString() + "\n");
}
return buffer.toString();
}