Merge pull request #174 from microsoftgraph/extensions-generated-java-merging

Extensions-generated java merging

Author: deepak2016

Templates/Java/BaseJavaModel.template.tt

@@ -234,9 +234,13 @@
     }
 
     public string BaseTypeCollectionResponse(OdcmObject c) {
-        return "Base" + TypeName(c) + "CollectionResponse";
+        return TypeCollectionResponse(c);
     }
 
+	public string TypeCollectionResponse(OdcmObject c) {
+        return TypeName(c) + "CollectionResponse";
+    } 
+
     public string TypeCollectionRequest(OdcmObject c) {
         if(c is OdcmProperty && c.AsOdcmProperty().IsReference()){
             return TypeCollectionWithReferencesRequest(c);
@@ -502,9 +506,9 @@
 
     public string CollectionRequestGeneric(OdcmObject c) {
         if (c is OdcmMethod) {
-            return "<" + BaseTypeCollectionResponse(c) + ", " + ITypeCollectionPage(c) + ">";
+            return "<" + TypeCollectionResponse(c) + ", " + ITypeCollectionPage(c) + ">";
         }
-        return "<" + BaseTypeCollectionResponse(c) + ", " + ITypeCollectionPage(c) + ">";
+        return "<" + TypeCollectionResponse(c) + ", " + ITypeCollectionPage(c) + ">";
     }
 
 	//Creating package definition for Enum.java.tt template file
@@ -527,7 +531,7 @@
 			if(propertyName == "BaseItem" || propertyName == "BaseItemVersion")
 				return "models.extensions";
 			else
-				return "models.generated";
+				return "models.extensions";
 		}
 
 		return "models.extensions";
@@ -540,7 +544,7 @@
 			return "requests.extensions";
 
 		if(propertyName.StartsWith("Base") || propertyName.StartsWith("IBase"))
-			return "requests.generated";
+			return "requests.extensions";
 
 		return "requests.extensions";
 	}
@@ -900,7 +904,7 @@ import java.util.EnumSet;", host.CurrentModel.NamespaceName());
 				if(property.Type is OdcmPrimitiveType)
 					continue;
 
-				var propertyType = BaseTypeCollectionResponse(property);
+				var propertyType = TypeCollectionResponse(property);
 				string importstr= String.Format(importFormat,
 							host.CurrentModel.NamespaceName(),
 							getPrefixForRequests(propertyType),
@@ -936,7 +940,6 @@ import {0}.models.extensions.*;
 import {0}.models.generated.*;
 import {0}.http.*;
 import {0}.requests.extensions.*;
-import {0}.requests.generated.*;
 import {0}.options.*;
 import {0}.serializer.*;
 
@@ -988,12 +991,7 @@ public {1} {2}{3}{4} {{";
             extendsStr,
             implementsStr);
 
-        if (name.StartsWith("Base") || name.StartsWith("IBase"))
-        {
-            return CreatAutogeneratedWarning() + declaration;
-        }
-
-        return CreateExtensiblityMessage() + declaration;
+        return CreatAutogeneratedWarning() + declaration;
     }
 
     public string GenericRequest(OdcmObject c){
@@ -1188,7 +1186,7 @@ public {1} {2}{3}{4} {{";
         }}
 ",
             property.Name.SanitizePropertyName(property),
-            BaseTypeCollectionResponse(property),
+            TypeCollectionResponse(property),
             TypeCollectionPage(property),
             property.GetTypeString());
             }

…Java/models_generated/BaseEntity.java.tt …ava/models_extensions/BaseEntity.java.ttTemplates/Java/models_generated/BaseEntity.java.tt renamed to Templates/Java/models_extensions/BaseEntity.java.tt Templates/Java/models_generated/BaseEntity.java.tt renamed to Templates/Java/models_extensions/BaseEntity.java.tt

@@ -2,6 +2,7 @@
 <#@ template debug="true" hostspecific="true" language="C#" #>
 <#@ include file="BaseJavaModel.template.tt"#>
 <#@ output extension="\\" #>
+<#host.TemplateName = TypeName(c);#>
 <#=writer.WriteHeader()#>
 <#=CreatePackageDefForEntity(host)#>
 
@@ -11,7 +12,7 @@ import com.google.gson.annotations.*;
 import java.util.HashMap;
 import java.util.Map;
 
-<#=CreateClassDef(BaseTypeName(c), BaseClassName(c), "IJsonBackedObject")#>
+<#=CreateClassDef(TypeName(c), BaseClassName(c), "IJsonBackedObject")#>
 
 <#
     if(((OdcmClass)c).Base == null){
@@ -33,4 +34,4 @@ import java.util.Map;
 <#=CreatePropertyDef(((OdcmClass)c).Properties, c is OdcmComplexClass)#>
 <#=CreateRawJsonObject()#>
 <#=UpdatePropertiesWithinSetRawObject(((OdcmClass)c).Properties, c is OdcmComplexClass)#>
-<#=PostProcess(BaseTypeName(c))#>}
+<#=PostProcess(TypeName(c))#>}

…/models_generated/BaseMethodBody.java.tt …models_extensions/BaseMethodBody.java.ttTemplates/Java/models_generated/BaseMethodBody.java.tt renamed to Templates/Java/models_extensions/BaseMethodBody.java.tt Templates/Java/models_generated/BaseMethodBody.java.tt renamed to Templates/Java/models_extensions/BaseMethodBody.java.tt

@@ -2,18 +2,17 @@
 <#@ template debug="true" hostspecific="true" language="C#" #>
 <#@ include file="BaseJavaModel.template.tt"#>
 <#@ output extension="\\" #>
-<#host.TemplateName = BaseTypeBody(c);#>
+<#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;
 import com.microsoft.graph.serializer.ISerializer;
-import com.microsoft.graph.models.extensions.*;
 import java.util.EnumSet;
 
-<#=CreateClassDef(BaseTypeBody(c))#>
+<#=CreateClassDef(TypeBody(c))#>
 
 <#=CreateParameterDef(c.AsOdcmMethod().Parameters)#>
 <#=CreateRawJsonObject()#>

Templates/Java/models_extensions/ExtensibleEntity.java.tt

@@ -2,9 +2,16 @@
 <#@ template debug="true" hostspecific="true" language="C#" #>
 <#@ include file="BaseJavaModel.template.tt"#>
 <#@ output extension="\\" #>
+<#host.TemplateName = IClientType(c);#>
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
+import com.google.gson.JsonObject;
 
 <#=CreateInterfaceDef(IClientType(c), IBaseClientType(c))#>
-
+<# if(host.TemplateName.Equals("IGraphServiceClient")){ #>
+    
+    <T> CustomRequestBuilder<T> customRequest(final String url, final Class<T> responseType);
+	
+    CustomRequestBuilder<JsonObject> customRequest(final String url);
+<# } #>
 }

…ava/models_generated/IBaseClient.java.tt …va/models_extensions/IBaseClient.java.ttTemplates/Java/models_generated/IBaseClient.java.tt renamed to Templates/Java/models_extensions/IBaseClient.java.tt Templates/Java/models_generated/IBaseClient.java.tt renamed to Templates/Java/models_extensions/IBaseClient.java.tt

@@ -2,23 +2,23 @@
 <#@ template debug="true" hostspecific="true" language="C#" #>
 <#@ include file="BaseJavaModel.template.tt"#>
 <#@ output extension="\\" #>
+<#host.TemplateName = TypeCollectionPage(c);#>
 <#=writer.WriteHeader()#>
-<#=CreatAutogeneratedWarning()#>
 <#=CreatePackageDefForBaseEntityCollectionPage(host)#>
 import com.microsoft.graph.http.BaseCollectionPage;
 
-<#=CreateClassDef(BaseTypeCollectionPage(c), "BaseCollectionPage" + CollectionPageGeneric(c), IBaseTypeCollectionPage(c))#>
+<#=CreateClassDef(TypeCollectionPage(c), "BaseCollectionPage" + CollectionPageGeneric(c), ITypeCollectionPage(c))#>
 <#
 String s = TypeName(c);
 #>
 
     /**
      * A collection page for <#=TypeName(c)#>
      *
-     * @param response the serialized <#=BaseTypeCollectionResponse(c)#> from the service
+     * @param response the serialized <#=TypeCollectionResponse(c)#> from the service
      * @param builder  the request builder for the next collection page
      */
-    public <#=BaseTypeCollectionPage(c)#>(final <#=BaseTypeCollectionResponse(c)#> response, final <#=ITypeCollectionRequestBuilder(c)#> builder) {
+    public <#=TypeCollectionPage(c)#>(final <#=TypeCollectionResponse(c)#> response, final <#=ITypeCollectionRequestBuilder(c)#> builder) {
         super(response.value, builder);
     }
 }

Templates/Java/models_extensions/IClient.java.tt

@@ -2,12 +2,11 @@
 <#@ template debug="true" hostspecific="true" language="C#" #>
 <#@ include file="BaseJavaModel.template.tt"#>
 <#@ output extension="\\" #>
-<#host.TemplateName = BaseTypeCollectionReferenceRequest(c);#>
+<#host.TemplateName = TypeCollectionReferenceRequest(c);#>
 <#=writer.WriteHeader()#>
-<#=CreatAutogeneratedWarning()#>
 <#=CreatePackageDef(host)#>
 
-<#=CreateClassDef(BaseTypeCollectionReferenceRequest(c), "BaseCollectionRequest" + CollectionRequestGeneric(c), IBaseTypeCollectionReferenceRequest(c))#>
+<#=CreateClassDef(TypeCollectionReferenceRequest(c), "BaseCollectionRequest" + CollectionRequestGeneric(c), ITypeCollectionReferenceRequest(c))#>
 
     /**
      * The request builder for this collection of <#=TypeName(c)#>
@@ -16,8 +15,8 @@
      * @param client         the service client
      * @param requestOptions the options for this request
      */
-    public <#=BaseTypeCollectionReferenceRequest(c)#>(final String requestUrl, <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
-        super(requestUrl, client, requestOptions, <#=BaseTypeCollectionResponse(c)#>.class, <#=ITypeCollectionPage(c)#>.class);
+    public <#=TypeCollectionReferenceRequest(c)#>(final String requestUrl, <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
+        super(requestUrl, client, requestOptions, <#=TypeCollectionResponse(c)#>.class, <#=ITypeCollectionPage(c)#>.class);
     }
 
     public void post(final <#=TypeName(c)#> new<#=TypeName(c)#>, final ICallback<<#=TypeName(c)#>> callback) {