svn commit: r988322 - /shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java

[zh...@apache.org]

Author: zhoresh
Date: Mon Aug 23 21:39:44 2010
New Revision: 988322

URL: http://svn.apache.org/viewvc?rev=988322&view=rev
Log:
http://codereview.appspot.com/1925042/
GadgetHandler restructure step 2: separate data construction (GadgetHandlerService) and JSON api (GadgetHandler)
Fix minor comments by John

Modified:
    shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java

Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java?rev=988322&r1=988321&r2=988322&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java Mon Aug 23 21:39:44 2010
@@ -49,7 +49,7 @@ import java.util.Map;
 public class BeanDelegator {
 
   /** Indicate NULL value for a field (To overcome shortcome of immutable map) */
-  public static final String NULL = "NULL";
+  public static final String NULL = "<NULL sentinel>";
 
   private static final Map<String, Object> EMPTY_FIELDS = ImmutableMap.of();
 
@@ -64,7 +64,7 @@ public class BeanDelegator {
 
   public BeanDelegator() {
     this(ImmutableMap.<Class<?>, Class<?>>of(),
-        ImmutableMap.<Enum<?>, Enum<?>>of());
+         ImmutableMap.<Enum<?>, Enum<?>>of());
   }
 
   public BeanDelegator(Map<Class<?>, Class<?>> delegatedClasses,
@@ -154,14 +154,14 @@ public class BeanDelegator {
     private final Map<String, Object> extraFields;
 
     public DelegateInvocationHandler(Object source) {
-      this(source, EMPTY_FIELDS);
+      this(source, null);
     }
 
     public DelegateInvocationHandler(Object source, Map<String, Object> extraFields) {
       Preconditions.checkNotNull(source);
-      Preconditions.checkNotNull(extraFields);
+
       this.source = source;
-      this.extraFields = extraFields;
+      this.extraFields = (extraFields == null ? EMPTY_FIELDS : extraFields);
     }
 
     /**