Import classes from java.util instead of using fully qualified name

Author: darxriggs

src/main/java/com/github/fabienrenaud/jjb/stream/UsersStreamDeserializer.java

@@ -14,6 +14,7 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class UsersStreamDeserializer implements StreamDeserializer<Users> {
 
@@ -710,21 +711,21 @@ private Friend moshiFriend(com.squareup.moshi.JsonReader reader) throws IOExcept
 
     @Override
     public Users underscore_java(String string) {
-        java.util.Map<String, Object> jso = (java.util.Map<String, Object>) com.github.underscore.lodash.U.fromJson(string);
+        Map<String, Object> jso = com.github.underscore.lodash.U.fromJson(string);
         Object v;
         Users uc = new Users();
 
         if ((v = jso.get("users")) != null) {
-            java.util.List<Object> jsarr = (java.util.List<Object>) v;
+            List<Object> jsarr = (List<Object>) v;
             uc.users = new ArrayList<>();
             for (Object vi : jsarr) {
-                uc.users.add(underscore_java((java.util.Map<String, Object>) vi));
+                uc.users.add(underscore_java((Map<String, Object>) vi));
             }
         }
         return uc;
     }
 
-    private User underscore_java(java.util.Map<String, Object> jso) {
+    private User underscore_java(Map<String, Object> jso) {
         Object v;
         User u = new User();
 
@@ -789,17 +790,17 @@ private User underscore_java(java.util.Map<String, Object> jso) {
             u.favoriteFruit = (String) v;
         }
         if ((v = jso.get("tags")) != null) {
-            java.util.List<Object> jsonarr = (java.util.List<Object>) v;
+            List<Object> jsonarr = (List<Object>) v;
             u.tags = new ArrayList<>();
             for (Object vi : jsonarr) {
                 u.tags.add((String) vi);
             }
         }
         if ((v = jso.get("friends")) != null) {
-            java.util.List<Object> jsonarr = (java.util.List<Object>) v;
+            List<Object> jsonarr = (List<Object>) v;
             u.friends = new ArrayList<>();
             for (Object vi : jsonarr) {
-                java.util.Map<String, Object> jso0 = (java.util.Map<String, Object>) vi;
+                Map<String, Object> jso0 = (Map<String, Object>) vi;
                 Friend f = new Friend();
                 f.id = (String) jso0.get("id");
                 f.name = (String) jso0.get("name");

src/main/java/com/github/fabienrenaud/jjb/stream/UsersStreamSerializer.java

@@ -759,7 +759,7 @@ private org.apache.tapestry5.json.JSONObject tapestry(final User u) throws IOExc
     public com.eclipsesource.json.JsonValue minimaljson(Users obj) throws IOException {
         com.eclipsesource.json.JsonObject jso = com.eclipsesource.json.Json.object();
         if (obj.users != null) {
-            com.eclipsesource.json.JsonArray jsarr = (com.eclipsesource.json.JsonArray) com.eclipsesource.json.Json.array();
+            com.eclipsesource.json.JsonArray jsarr = com.eclipsesource.json.Json.array();
             for (User u : obj.users) {
                 jsarr.add(minimaljson(u));
             }
@@ -815,14 +815,14 @@ private com.eclipsesource.json.JsonValue minimaljson(final User u) throws IOExce
         jso.add("latitude", u.latitude);
         jso.add("longitude", u.longitude);
         if (u.tags != null) {
-            com.eclipsesource.json.JsonArray jsarr = (com.eclipsesource.json.JsonArray) com.eclipsesource.json.Json.array();
+            com.eclipsesource.json.JsonArray jsarr = com.eclipsesource.json.Json.array();
             for (String t : u.tags) {
                 jsarr.add(t);
             }
             jso.add("tags", jsarr);
         }
         if (u.friends != null) {
-            com.eclipsesource.json.JsonArray jsarr = (com.eclipsesource.json.JsonArray) com.eclipsesource.json.Json.array();
+            com.eclipsesource.json.JsonArray jsarr = com.eclipsesource.json.Json.array();
             for (Friend f : u.friends) {
                 com.eclipsesource.json.JsonObject jso0 = com.eclipsesource.json.Json.object();
                 jso0.add("id", f.id);
@@ -1074,9 +1074,9 @@ private mjson.Json mjson(User user) throws IOException {
 
     @Override
     public String underscore_java(final Users obj) throws IOException {
-        java.util.Map<String, Object> jso = new java.util.LinkedHashMap<>();
+        Map<String, Object> jso = new LinkedHashMap<>();
         if (obj.users != null) {
-            java.util.List<Object> jsarr = new java.util.ArrayList<>();
+            List<Object> jsarr = new ArrayList<>();
             for (User u : obj.users) {
                 jsarr.add(underscore_java(u));
             }
@@ -1085,8 +1085,8 @@ public String underscore_java(final Users obj) throws IOException {
         return com.github.underscore.lodash.U.toJson(jso);
     }
 
-    private java.util.Map<String, Object> underscore_java(final User u) throws IOException {
-        java.util.Map<String, Object> jso = new java.util.LinkedHashMap<>();
+    private Map<String, Object> underscore_java(final User u) throws IOException {
+        Map<String, Object> jso = new LinkedHashMap<>();
         if (u._id != null) {
             jso.put("_id", u._id);
         }
@@ -1132,16 +1132,16 @@ private java.util.Map<String, Object> underscore_java(final User u) throws IOExc
         jso.put("latitude", u.latitude);
         jso.put("longitude", u.longitude);
         if (u.tags != null) {
-            java.util.List<Object> jsarr = new java.util.ArrayList<>();
+            List<Object> jsarr = new ArrayList<>();
             for (String t : u.tags) {
                 jsarr.add(t);
             }
             jso.put("tags", jsarr);
         }
         if (u.friends != null) {
-            java.util.List<Object> jsarr = new java.util.ArrayList<>();
+            List<Object> jsarr = new ArrayList<>();
             for (Friend f : u.friends) {
-                java.util.Map<String, Object> jso0 = new java.util.LinkedHashMap<>();
+                Map<String, Object> jso0 = new LinkedHashMap<>();
                 jso0.put("id", f.id);
                 jso0.put("name", f.name);
                 jsarr.add(jso0);