Minor javadoc, unit test fixes

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/DeserializationFeature.java

@@ -127,7 +127,8 @@ public enum DeserializationFeature implements ConfigFeature
      * is thrown to indicate this; if not, default value is used
      * (0 for 'int', 0.0 for double, same defaulting as what JVM uses).
      *<p>
-     * Feature is disabled by default.
+     * Feature is disabled by default for Jackson 2.x: will be changed
+     * to enabled in 3.0.
      */
     FAIL_ON_NULL_FOR_PRIMITIVES(false),
 

src/main/java/com/fasterxml/jackson/databind/MapperFeature.java

@@ -379,7 +379,7 @@ public enum MapperFeature implements ConfigFeature
      *<p>
      * Feature is enabled by default.
      */
-    DEFAULT_VIEW_INCLUSION(true),
+    DEFAULT_VIEW_INCLUSION(false),
 
     /*
     /******************************************************

src/test/java/com/fasterxml/jackson/databind/big/BiggerDataTest.java

@@ -12,65 +12,65 @@
 
 public class BiggerDataTest
 {
-	static class Citm
-	{
-		public Map<Integer,String> areaNames;
-		public Map<Integer,String> audienceSubCategoryNames;
-		public Map<Integer,String> blockNames;
-		public Map<Integer,String> seatCategoryNames;
-		public Map<Integer,String> subTopicNames;
-		public Map<Integer,String> subjectNames;
-		public Map<Integer,String> topicNames;
-		public Map<Integer,int[]> topicSubTopics;
-		public Map<String,String> venueNames;
-
-		public Map<Integer,Event> events;
-		public List<Performance> performances;
-	}
-
-	static class Event
-	{
-		public int id;
-		public String name;
-		public String description;
-		public String subtitle;
-		public String logo;
-		public int subjectCode;
-		public int[] topicIds;
-		public LinkedHashSet<Integer> subTopicIds;
-	}
-
-	static class Performance
-	{
-		public int id;
-		public int eventId;
-		public String name;
-		public String description;
-		public String logo;
-
-		public List<Price> prices;
-		public List<SeatCategory> seatCategories;
-
-		public long start;
-		public String seatMapImage;
-		public String venueCode;
-}
-
-	static class Price {
-		public int amount;
-		public int audienceSubCategoryId;
-		public int seatCategoryId;
-	}
-
-	static class SeatCategory {
-		public int seatCategoryId;
-		public List<Area> areas;
-	}
-
-	static class Area {
-		public int areaId;
-		public int[] blockIds;
-	}
+    static class Citm
+    {
+        public Map<Integer,String> areaNames;
+        public Map<Integer,String> audienceSubCategoryNames;
+        public Map<Integer,String> blockNames;
+        public Map<Integer,String> seatCategoryNames;
+        public Map<Integer,String> subTopicNames;
+        public Map<Integer,String> subjectNames;
+        public Map<Integer,String> topicNames;
+        public Map<Integer,int[]> topicSubTopics;
+        public Map<String,String> venueNames;
+
+        public Map<Integer,Event> events;
+        public List<Performance> performances;
+    }
+
+    static class Event
+    {
+        public int id;
+        public String name;
+        public String description;
+        public String subtitle;
+        public String logo;
+        public Integer subjectCode; // nullable
+        public int[] topicIds;
+        public LinkedHashSet<Integer> subTopicIds;
+    }
+
+    static class Performance
+    {
+        public int id;
+        public int eventId;
+        public String name;
+        public String description;
+        public String logo;
+
+        public List<Price> prices;
+        public List<SeatCategory> seatCategories;
+
+        public long start;
+        public String seatMapImage;
+        public String venueCode;
+    }
+
+    static class Price {
+        public int amount;
+        public int audienceSubCategoryId;
+        public int seatCategoryId;
+    }
+
+    static class SeatCategory {
+        public int seatCategoryId;
+        public List<Area> areas;
+    }
+
+    static class Area {
+        public int areaId;
+        public int[] blockIds;
+    }
 
     /*
     /**********************************************************