minor cleanup, javadoc adds

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/datatype/guava/GuavaModule.java

@@ -28,7 +28,7 @@ public void setupModule(SetupContext context)
     @Override
     public int hashCode()
     {
-        return GuavaModule.class.hashCode();
+        return NAME.hashCode();
     }
 
     @Override

src/main/java/com/fasterxml/jackson/datatype/guava/GuavaSerializers.java

@@ -63,8 +63,11 @@ public JsonSerializer<?> findSerializer(SerializationConfig config, JavaType typ
 	}
         // since 2.4.5
         if (FluentIterable.class.isAssignableFrom(raw)) {
-            JavaType[] params = config.getTypeFactory().findTypeParameters(type, Iterable.class);
-            JavaType vt = (params == null || params.length != 1) ? TypeFactory.unknownType() : params[0];
+            // We can use parameter type that GuavaTypeModifier has kindly resolved for us
+            JavaType vt = type.containedType(0);
+            if (vt == null) { // should never happen but
+                vt = TypeFactory.unknownType();
+            }
             // 04-Dec-2014, tatu: Not 100% sure why latter would fail... need to investigate when I have time
             JavaType delegate = config.getTypeFactory().constructParametrizedType(Iterable.class, Iterable.class, vt);
 //            JavaType delegate = config.getTypeFactory().constructParametrizedType(FluentIterable.class, Iterable.class, vt);

src/main/java/com/fasterxml/jackson/datatype/guava/GuavaTypeModifier.java

@@ -12,8 +12,28 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Range;
 
+/**
+ * We need somewhat hacky support for following Guava types:
+ *<ul>
+ *  <li>FluentIterable: addition of seeming "empty" property should not prevent serialization as
+ *       basic `Iterable` (with standard Jackson (de)serializer)
+ *   </li>
+ *  <li>Multimap: can reuse much/most of standard Map support as long as we make sure it is
+ *      recognized as "Map-like" type (similar to how Scala Maps are supported)
+ *   </li>
+ *  <li>Optional: generic type, simpler, more-efficient to detect parameterization here (although
+ *      not strictly mandatory)
+ *   </li>Range: same as with Optional, might as well resolve generic type information early on
+ *  <li>
+ *   </li>
+ *</ul>
+ */
 public class GuavaTypeModifier extends TypeModifier
 {
+    /**
+     * Set of single-parameter-type types that we can handle using "standard" handling,
+     * no additional tricks needed.
+     */
     private final static Class<?>[] SINGLE_PARAM_TYPES = new Class<?>[] {
         Range.class, Optional.class
     };

src/test/java/com/fasterxml/jackson/datatype/guava/failing/OptionalUnwrappedTest.java

@@ -33,9 +33,9 @@ static class OptionalParent {
 
     public void testUntyped() throws Exception
     {
-        ObjectWriter w = MAPPER.writerWithDefaultPrettyPrinter();
+        ObjectWriter w = MAPPER.writer();
 //        String jsonExp = w.writeValueAsString(new Parent());
-        String jsonExp = aposToQuotes("{\n  'name' : 'Bob'\n}");
+        String jsonExp = aposToQuotes("{'name':'Bob'}");
         String jsonAct = w.writeValueAsString(new OptionalParent());
         assertEquals(jsonExp, jsonAct);
     }