Fixing java template for import statement - these are new additions and required handling for EnumSet

Author: deepak2016

Templates/Java/models_generated/BaseMethodBody.java.tt

@@ -11,6 +11,7 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.JsonObject;
 import com.microsoft.graph.serializer.ISerializer;
 import com.microsoft.graph.models.extensions.*;
+import java.util.EnumSet;
 
 <#=CreateClassDef(BaseTypeBody(c))#>
 

Templates/Java/requests_generated/BaseEntityRequestBuilder.java.tt

@@ -8,6 +8,7 @@
 import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.http.BaseRequestBuilder;
 import com.microsoft.graph.options.Option;
+import java.util.EnumSet;
 
 <#=CreateClassDef(BaseTypeRequestBuilder(c), "BaseRequestBuilder", IBaseTypeRequestBuilder(c))#>
 
@@ -225,10 +226,15 @@ if (c.AsOdcmClass() != null)
 				foreach (var p in method.Parameters)
 				{
 					if(!(p.Type is OdcmPrimitiveType) && p.Type.GetTypeString() != "com.google.gson.JsonElement") {
+						var typeString = p.Type.GetTypeString();
+						if(p.Type.GetTypeString().StartsWith("EnumSet<")){
+							typeString = typeString.Substring(typeString.IndexOf("<") + 1);
+							typeString = typeString.Substring(0, typeString.Length-1);
+						}
 						sb.AppendFormat(importFormat,
 							host.CurrentModel.NamespaceName(),
 							getPackagePrefix(p),
-							p.Type.GetTypeString());
+							typeString);
 						sb.Append("\n");
 					}
 				}

Templates/Java/requests_generated/IBaseEntityRequestBuilder.java.tt

@@ -7,6 +7,7 @@
 <#=CreatePackageDefForIBaseEntityRequestBuilder(host)#>
 import com.microsoft.graph.http.IRequestBuilder;
 import com.microsoft.graph.options.Option;
+import java.util.EnumSet;
 
 <#=CreateInterfaceDef(IBaseTypeRequestBuilder(c), "IRequestBuilder")#>
     /**
@@ -171,10 +172,15 @@ if (c.AsOdcmClass() != null)
 				foreach (var p in method.Parameters)
 				{
 					if(!(p.Type is OdcmPrimitiveType) && p.Type.GetTypeString() != "com.google.gson.JsonElement") {
+						var typeString = p.Type.GetTypeString();
+						if(p.Type.GetTypeString().StartsWith("EnumSet<")){
+							typeString = typeString.Substring(typeString.IndexOf("<") + 1);
+							typeString = typeString.Substring(0, typeString.Length-1);
+						}
 						sb.AppendFormat(importFormat,
 							host.CurrentModel.NamespaceName(),
 							getPackagePrefix(p),
-							p.Type.GetTypeString());
+							typeString);
 						sb.Append("\n");
 					}
 				}