FunctionOption fixes, generated.* is needed

Author: zengin

Templates/Java/requests_extensions/BaseMethodCollectionRequestBuilder.java.tt

@@ -25,7 +25,7 @@
 		}
   <# } else { #>
    	 if(<#=p.ParamName()#>!=null){
-			functionOptions.add(new FunctionOption("<#=p.ParamName()#>", <#=p.ParamName()#>));
+			functionOptions.add(new com.microsoft.graph.options.FunctionOption("<#=p.ParamName()#>", <#=p.ParamName()#>));
 		}
   <# } #>
 <# } #>
@@ -50,7 +50,7 @@
         }
   <# } #>
 <# } else { #>
-      for (FunctionOption option : functionOptions) {
+      for (com.microsoft.graph.options.FunctionOption option : functionOptions) {
             request.addFunctionOption(option);
       }
 <# } #>

Templates/Java/requests_extensions/BaseMethodRequestBuilder.java.tt

@@ -8,8 +8,6 @@
 import com.microsoft.graph.core.BaseActionRequestBuilder;
 import com.microsoft.graph.core.BaseFunctionRequestBuilder;
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.options.Option;
-import com.microsoft.graph.options.FunctionOption;
 import com.google.gson.JsonElement;
 
 <# bool isAction = !c.AsOdcmMethod().IsFunction; #>
@@ -29,7 +27,7 @@ import com.google.gson.JsonElement;
 <#         if (isAction) { #>
         bodyParams.put("<#=p.ParamName()#>", <#=p.ParamName()#>);
 <#         } else { #>
-        functionOptions.add(new FunctionOption("<#=p.ParamName()#>", <#=p.ParamName()#>));
+        functionOptions.add(new com.microsoft.graph.options.FunctionOption("<#=p.ParamName()#>", <#=p.ParamName()#>));
 <#         } #>
 <#     } #>
     }
@@ -65,7 +63,7 @@ import com.google.gson.JsonElement;
 
 <#   } #>
 <# } else { #>
-      for (FunctionOption option : functionOptions) {
+      for (com.microsoft.graph.options.FunctionOption option : functionOptions) {
             request.addFunctionOption(option);
       }
 

src/GraphODataTemplateWriter/CodeHelpers/Java/TypeHelperJava.cs

@@ -1132,7 +1132,8 @@ public static string CreatePackageDef(this CustomT4Host host)
 
 import {2}.concurrency.*;
 import {2}.core.*;
-import {0}.models.extensions.*;{3}{4}
+import {0}.models.extensions.*;
+import {0}.models.generated.*;{3}{4}
 import {2}.http.*;
 import {0}.requests.extensions.*;
 import {2}.serializer.*;