Merge branch 'dev' of https://github.com/microsoftgraph/MSGraph-SDK-Code-Generator into extensions-generated-java-merging

Author: Nakul Sabharwal

Templates/Java/BaseJavaModel.template.tt

@@ -666,10 +666,16 @@
 			foreach (var p in method.Parameters)
 			{
 				if(!(p.Type is OdcmPrimitiveType) && p.Type.GetTypeString() != "com.google.gson.JsonElement") {
+					var propertyType = p.Type.GetTypeString();
+					if(propertyType.StartsWith("EnumSet")){
+						propertyType = propertyType.Substring("EnumSet<".Length, propertyType.Length-("EnumSet<".Length+1));
+						sb.Append("import java.util.EnumSet;\n");
+					}
+						
 					sb.AppendFormat(importFormat,
 						host.CurrentModel.NamespaceName(),
 						getPackagePrefix(p),
-						p.Type.GetTypeString());
+						propertyType);
 					sb.Append("\n");
 				}
 			}