Fixing bug related to Edm namespace prefixing whereby types like

Edm.Boolean were being converted to microsoft.graph.extensions.Boolean
instead of java.lang.Boolean

Author: Brian Melton

Templates/Android/BaseModel.template.tt

@@ -5,7 +5,7 @@
     CustomT4Host host          = (CustomT4Host) Host;
     var model                  = host.CurrentModel;
     CodeWriterAndroid writer   = (CodeWriterAndroid) host.CodeWriter;
-    bool logTemplateSrc        = false;
+    bool logTemplateSrc        = true;
     var c = host.CurrentType;
 #>
 <# if (logTemplateSrc) { #>
@@ -619,14 +619,14 @@ public {1} {2}{3}{4} {{";
      * The {0}.
      */
     @SerializedName(""{1}"")
-    public {4}{2} {3};
+    public {2} {3};
 
 ";
         var collectionFormat =
 @"    /**
      * The {0}.
      */
-    public transient {4}{2} {3};
+    public transient {2} {3};
 
 ";
 
@@ -635,7 +635,6 @@ public {1} {2}{3}{4} {{";
             var propertyName = property.Name.ToUpperFirstChar();
             var propertyType = "";
             var propertyFormat = format;
-            var shouldFullyQualify = TypeHelperAndroid.ReservedNames.Contains(propertyName);
             if (property.IsCollection)
             {
                 if (!property.IsNavigation())
@@ -657,8 +656,7 @@ public {1} {2}{3}{4} {{";
                 propertyName.SplitCamelCase(),
                 property.Name,
                 propertyType,
-                property.SanitizePropertyName().ToLowerFirstChar(),
-                shouldFullyQualify ? "com.microsoft.graph.extensions." : "");
+                property.SanitizePropertyName().ToLowerFirstChar());
         }
         return sb.ToString();
     }

src/GraphODataTemplateWriter/CodeHelpers/Android/TypeHelperAndroid.cs

@@ -35,6 +35,8 @@ public static string GetTypeString(this OdcmType @type)
                     return "java.util.Calendar";
                 case "Date":
                     return "com.microsoft.graph.model.DateOnly";
+                case "Json":
+                    return "com.google.gson.JsonElement";
                 case "Binary":
                     return "byte[]";
                 default:
@@ -49,7 +51,13 @@ public static string GetTypeString(this OdcmParameter parameter)
 
         public static string GetTypeString(this OdcmProperty property)
         {
-            return GetTypeString(property.Projection.Type);
+            var propertyType = property.Projection.Type;
+            var typeString = GetTypeString(propertyType);
+            if (propertyType.Namespace != OdcmNamespace.Edm && ReservedNames.Contains(typeString))
+            {
+                typeString = "com.microsoft.graph.extensions." + typeString;
+            }
+            return typeString;
         }
 
         public static bool IsComplex(this OdcmParameter property)