Fixing import statements for BaseEntityRequestBuilder template. This template generates ~250 files.

Author: deepak2016

Templates/Java/requests_generated/BaseEntityRequestBuilder.java.tt

@@ -4,7 +4,10 @@
 <#@ output extension="\\" #>
 <#host.TemplateName = BaseTypeRequestBuilder(c);#>
 <#=writer.WriteHeader()#>
-<#=CreatePackageDef(host)#>
+<#=CreatePackageDefForBaseEntityRequestBuilder(host)#>
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.BaseRequestBuilder;
+import com.microsoft.graph.options.Option;
 
 <#=CreateClassDef(BaseTypeRequestBuilder(c), "BaseRequestBuilder", IBaseTypeRequestBuilder(c))#>
 
@@ -133,3 +136,130 @@ if (c.AsOdcmClass() != null)
 }
 #>
 }
+
+<#+
+	public string CreatePackageDefForBaseEntityRequestBuilder(CustomT4Host host)
+	{
+		var sb = new StringBuilder();
+		sb.Append(CreatePackageDefinition(host));
+
+		var importFormat = @"import {0}.{1}.{2};";
+		sb.AppendFormat(importFormat,
+						host.CurrentModel.NamespaceName(),
+						"requests.extensions",
+						ITypeRequest(host.CurrentType));
+		sb.Append("\n");
+		sb.AppendFormat(importFormat,
+						host.CurrentModel.NamespaceName(),
+						"requests.extensions",
+						TypeRequest(host.CurrentType));
+		sb.Append("\n");
+		var c = host.CurrentType;
+		if (c.AsOdcmClass() != null)
+		{
+			foreach(var prop in c.AsOdcmClass().NavigationProperties())
+			{
+				if (prop.IsCollection()) {
+					
+					sb.AppendFormat(importFormat,
+						host.CurrentModel.NamespaceName(),
+						"requests.extensions",
+						ITypeCollectionRequestBuilder(prop));
+					sb.Append("\n");
+
+					sb.AppendFormat(importFormat,
+						host.CurrentModel.NamespaceName(),
+						"requests.extensions",
+						TypeCollectionRequestBuilder(prop));
+					sb.Append("\n");
+				}
+				sb.AppendFormat(importFormat,
+						host.CurrentModel.NamespaceName(),
+						"requests.extensions",
+						ITypeRequestBuilder(prop));
+				sb.Append("\n");
+
+				sb.AppendFormat(importFormat,
+						host.CurrentModel.NamespaceName(),
+						"requests.extensions",
+						TypeRequestBuilder(prop));
+				sb.Append("\n");
+			}
+
+			foreach (var prop in c.AsOdcmClass().GetProperties(typeName:"Stream"))
+			{
+				var propRequestBuilder = TypeRequestBuilder(prop);
+				sb.AppendFormat(importFormat,
+						host.CurrentModel.NamespaceName(),
+						"requests.extensions",
+						"I" + propRequestBuilder);
+				sb.Append("\n");
+
+				sb.AppendFormat(importFormat,
+						host.CurrentModel.NamespaceName(),
+						"requests.extensions",
+						propRequestBuilder);
+				sb.Append("\n");
+			}
+
+			if (c is OdcmMediaClass)
+			{
+				sb.AppendFormat(importFormat,
+						host.CurrentModel.NamespaceName(),
+						"requests.extensions",
+						ITypeStreamRequestBuilder(host.CurrentType));
+				sb.Append("\n");
+
+				sb.AppendFormat(importFormat,
+						host.CurrentModel.NamespaceName(),
+						"requests.extensions",
+						TypeStreamRequestBuilder(host.CurrentType));
+				sb.Append("\n");
+			}
+
+			foreach (var method in c.AsOdcmClass().MethodsAndOverloads()) {
+				if (method.IsBoundToCollection) {
+					continue;
+				}
+
+				foreach (var p in method.Parameters)
+				{
+					if(!(p.Type is OdcmPrimitiveType) && p.Type.GetTypeString() != "com.google.gson.JsonElement") {
+						sb.AppendFormat(importFormat,
+							host.CurrentModel.NamespaceName(),
+							getPackagePrefix(p),
+							p.Type.GetTypeString());
+						sb.Append("\n");
+					}
+				}
+
+				if (method.IsCollection) {
+					sb.AppendFormat(importFormat,
+						host.CurrentModel.NamespaceName(),
+						"requests.extensions",
+						ITypeCollectionRequestBuilder(method));
+					sb.Append("\n");
+
+					sb.AppendFormat(importFormat,
+						host.CurrentModel.NamespaceName(),
+						"requests.extensions",
+						TypeCollectionRequestBuilder(method));
+					sb.Append("\n");
+				} else {
+					sb.AppendFormat(importFormat,
+						host.CurrentModel.NamespaceName(),
+						"requests.extensions",
+						ITypeRequestBuilder(method));
+					sb.Append("\n");
+
+					sb.AppendFormat(importFormat,
+						host.CurrentModel.NamespaceName(),
+						"requests.extensions",
+						TypeRequestBuilder(method));
+					sb.Append("\n");
+				}
+			}
+		}
+		return sb.ToString();
+	}
+#>