Extension code removal

Author: Nakul Sabharwal

Templates/Java/BaseJavaModel.template.tt

@@ -555,7 +555,7 @@
 		var propertyType = property.GetTypeString();
 
 		if(property.Type is OdcmEnum)
-			return "models.extensions";
+			return "models.generated";
 
 		return getPrefixForModels(propertyType);	
 	}
@@ -566,7 +566,7 @@
 		var propertyType = property.GetTypeString();
 
 		if(property.Type is OdcmEnum)
-			return "models.extensions";
+			return "models.generated";
 
 		return getPrefixForModels(propertyType);	
 	}
@@ -937,6 +937,7 @@ import java.util.EnumSet;", host.CurrentModel.NamespaceName());
 import {0}.concurrency.*;
 import {0}.core.*;
 import {0}.models.extensions.*;
+import {0}.models.generated.*;
 import {0}.http.*;
 import {0}.requests.extensions.*;
 import {0}.options.*;

Templates/Java/models/extensions/BaseEntity.java.tt

@@ -0,0 +1,37 @@
+<# // Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information. #>
+<#@ template debug="true" hostspecific="true" language="C#" #>
+<#@ include file="BaseJavaModel.template.tt"#>
+<#@ output extension="\\" #>
+<#host.TemplateName = TypeName(c);#>
+<#=writer.WriteHeader()#>
+<#=CreatePackageDefForEntity(host)#>
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
+import com.google.gson.annotations.*;
+import java.util.HashMap;
+import java.util.Map;
+
+<#=CreateClassDef(TypeName(c), BaseClassName(c), "IJsonBackedObject")#>
+
+<#
+    if(((OdcmClass)c).Base == null){
+#>
+    @SerializedName("@odata.type")
+    @Expose
+    public String oDataType;
+
+    private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
+
+    @Override
+    public final AdditionalDataManager additionalDataManager() {
+        return additionalDataManager;
+    }
+<#
+    }
+#>
+
+<#=CreatePropertyDef(((OdcmClass)c).Properties, c is OdcmComplexClass)#>
+<#=CreateRawJsonObject()#>
+<#=UpdatePropertiesWithinSetRawObject(((OdcmClass)c).Properties, c is OdcmComplexClass)#>
+<#=PostProcess(TypeName(c))#>}

Templates/Java/models_extensions/BaseEntity.java.tt

@@ -5,7 +5,7 @@
 <#host.TemplateName = TypeBody(c);#>
 <#=writer.WriteHeader()#>
 <#=CreatePackageDefinition(host)#>
-
+import com.microsoft.graph.models.generated.*;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.JsonObject;