refactor helper methods from BaseJavaModel.template.tt to TypeHelperJava.cs

Author: zengin

Templates/Java/BaseJavaModel.template.tt

@@ -2,17 +2,17 @@
 <#@ template debug="true" hostspecific="true" language="C#" #>
 <#@ include file="BaseJavaModel.template.tt"#>
 <#@ output extension="\\" #>
-<#host.TemplateName = TypeName(c);#>
+<#host.TemplateName = c.TypeName();#>
 <#=writer.WriteHeader()#>
-<#=CreatePackageDefForEntity(host)#>
+<#=host.CreatePackageDefForEntity()#>
 
 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")#>
+<#=TypeHelperJava.CreateClassDef(c.TypeName(), c.BaseClassName(), "IJsonBackedObject")#>
 
 <#
     if(((OdcmClass)c).Base == null){
@@ -31,7 +31,7 @@ import java.util.Map;
     }
 #>
 
-<#=CreatePropertyDef(((OdcmClass)c).Properties, c is OdcmComplexClass)#>
-<#=CreateRawJsonObject()#>
-<#=UpdatePropertiesWithinSetRawObject(((OdcmClass)c).Properties, c is OdcmComplexClass)#>
-<#=PostProcess(TypeName(c))#>}
+<#=TypeHelperJava.CreatePropertyDef(((OdcmClass)c).Properties, c is OdcmComplexClass)#>
+<#=TypeHelperJava.CreateRawJsonObject()#>
+<#=TypeHelperJava.UpdatePropertiesWithinSetRawObject(((OdcmClass)c).Properties, c is OdcmComplexClass)#>
+<#=PostProcess(c.TypeName())#>}

Templates/Java/models_extensions/BaseEntity.java.tt

@@ -2,19 +2,19 @@
 <#@ template debug="true" hostspecific="true" language="C#" #>
 <#@ include file="BaseJavaModel.template.tt"#>
 <#@ output extension="\\" #>
-<#host.TemplateName = TypeBody(c);#>
+<#host.TemplateName = c.TypeBody();#>
 <#=writer.WriteHeader()#>
-<#=CreatePackageDefinition(host)#>
+<#=host.CreatePackageDefinition()#>
 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 java.util.EnumSet;
 
-<#=CreateClassDef(TypeBody(c))#>
+<#=TypeHelperJava.CreateClassDef(c.TypeBody())#>
 
-<#=CreateParameterDef(c.AsOdcmMethod().Parameters)#>
-<#=CreateRawJsonObject()#>
+<#=TypeHelperJava.CreateParameterDef(c.AsOdcmMethod().Parameters)#>
+<#=TypeHelperJava.CreateRawJsonObject()#>
     }
 }

Templates/Java/models_extensions/BaseMethodBody.java.tt

@@ -3,9 +3,9 @@
 <#@ include file="BaseJavaModel.template.tt"#>
 <#@ output extension="\\" #>
 <#=writer.WriteHeader()#>
-<#=CreatePackageDef(host)#>
+<#=host.CreatePackageDef()#>
 
-<#=CreateInterfaceDef(IBaseClientType(c), "IBaseClient")#>
+<#=TypeHelperJava.CreateInterfaceDef(c.IBaseClientType(host), "IBaseClient")#>
 <#
 foreach (var prop in model.EntityContainer.Properties)
 {
@@ -19,27 +19,27 @@ foreach (var prop in model.EntityContainer.Properties)
      *
      * @return the request builder for the collection of <#=propertyName#> objects
      */
-    <#=ITypeCollectionRequestBuilder(prop)#> <#=prop.Name#>();
+    <#=prop.ITypeCollectionRequestBuilder()#> <#=prop.Name#>();
 
     /**
      * Gets a single <#=propertyName#>
      *
      * @param id the id of the <#=propertyName#> to retrieve
      * @return the request builder for the <#=propertyName#> object
      */
-    <#=ITypeRequestBuilder(prop)#> <#=prop.Name#>(final String id);
+    <#=prop.ITypeRequestBuilder()#> <#=prop.Name#>(final String id);
 <#
     }
     else
     {
 #>
 
     /**
-     * Gets the <#=TypeRequestBuilder(c)#>
+     * Gets the <#=c.TypeRequestBuilder()#>
      *
      * @return the <#=prop.Projection.Type.GetTypeString()#>
      */
-    <#=ITypeRequestBuilder(prop)#> <#=prop.Name#>();
+    <#=prop.ITypeRequestBuilder()#> <#=prop.Name#>();
 <#
     }
 }

Templates/Java/models_extensions/IBaseClient.java.tt

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

Templates/Java/models_extensions/IClient.java.tt

@@ -3,7 +3,7 @@
 <#@ include file="BaseJavaModel.template.tt"#>
 <#@ output extension="\\" #>
 <#=writer.WriteHeader()#>
-<#=CreatePackageDefForEnum(host)#>
+<#=host.CreatePackageDefForEnum()#>
 
 /**
  * The Enum <#=c.Name.ToUpperFirstChar().SplitCamelCase()#>.

Templates/Java/models_generated/Enum.java.tt

@@ -3,9 +3,9 @@
 <#@ include file="BaseJavaModel.template.tt"#>
 <#@ output extension="\\" #>
 <#=writer.WriteHeader()#>
-<#=CreatePackageDef(host)#>
+<#=host.CreatePackageDef()#>
 
-<#=CreateClassDef(BaseClientType(c), "BaseClient", IBaseClientType(c))#>
+<#=TypeHelperJava.CreateClassDef(c.BaseClientType(host), "BaseClient", c.IBaseClientType(host))#>
 
     /**
      * The default endpoint for the Microsoft Graph Service
@@ -42,8 +42,8 @@ foreach (var prop in model.EntityContainer.Properties)
      *
      * @return the request builder for the collection of <#=propertyName#> objects
      */
-    public <#=ITypeCollectionRequestBuilder(prop)#> <#=prop.Name#>() {
-        return new <#=TypeCollectionRequestBuilder(prop)#>(getServiceRoot() + "/<#=prop.Name#>", (<#=IClientType(c)#>)this, null);
+    public <#=prop.ITypeCollectionRequestBuilder()#> <#=prop.Name#>() {
+        return new <#=prop.TypeCollectionRequestBuilder()#>(getServiceRoot() + "/<#=prop.Name#>", (<#=c.IClientType(host)#>)this, null);
     }
 
     /**
@@ -52,8 +52,8 @@ foreach (var prop in model.EntityContainer.Properties)
      * @param id the id of the <#=propertyName#> to retrieve
      * @return the request builder for the <#=propertyName#> object
      */
-    public <#=ITypeRequestBuilder(prop)#> <#=prop.Name#>(final String id) {
-        return new <#=TypeRequestBuilder(prop)#>(getServiceRoot() + "/<#=prop.Name#>/" + id, (<#=IClientType(c)#>)this, null);
+    public <#=prop.ITypeRequestBuilder()#> <#=prop.Name#>(final String id) {
+        return new <#=prop.TypeRequestBuilder()#>(getServiceRoot() + "/<#=prop.Name#>/" + id, (<#=c.IClientType(host)#>)this, null);
     }
 <#
     }
@@ -62,12 +62,12 @@ foreach (var prop in model.EntityContainer.Properties)
 #>
 
     /**
-     * Gets the <#=TypeRequestBuilder(c)#>
+     * Gets the <#=c.TypeRequestBuilder()#>
      *
      * @return the <#=prop.Projection.Type.GetTypeString()#>
      */
-    public <#=ITypeRequestBuilder(prop)#> <#=prop.Name#>() {
-        return new <#=TypeRequestBuilder(prop)#>(getServiceRoot() + "/<#=prop.Name#>", (<#=IClientType(c)#>)this, null);
+    public <#=prop.ITypeRequestBuilder()#> <#=prop.Name#>() {
+        return new <#=prop.TypeRequestBuilder()#>(getServiceRoot() + "/<#=prop.Name#>", (<#=c.IClientType(host)#>)this, null);
     }
 <#
     }

Templates/Java/requests_extensions/BaseClient.java.tt

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

Templates/Java/requests_extensions/BaseEntityCollectionPage.java.tt

@@ -2,24 +2,24 @@
 <#@ template debug="true" hostspecific="true" language="C#" #>
 <#@ include file="BaseJavaModel.template.tt"#>
 <#@ output extension="\\" #>
-<#host.TemplateName = TypeCollectionReferenceRequest(c);#>
+<#host.TemplateName = c.TypeCollectionReferenceRequest();#>
 <#=writer.WriteHeader()#>
-<#=CreatePackageDef(host)#>
+<#=host.CreatePackageDef()#>
 
-<#=CreateClassDef(TypeCollectionReferenceRequest(c), "BaseCollectionRequest" + CollectionRequestGeneric(c), ITypeCollectionReferenceRequest(c))#>
+<#=TypeHelperJava.CreateClassDef(c.TypeCollectionReferenceRequest(), "BaseCollectionRequest" + c.CollectionRequestGeneric(), c.ITypeCollectionReferenceRequest())#>
 
     /**
-     * The request builder for this collection of <#=TypeName(c)#>
+     * The request builder for this collection of <#=c.TypeName()#>
      *
      * @param requestUrl     the request URL
      * @param client         the service client
      * @param requestOptions the options for this request
      */
-    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 <#=c.TypeCollectionReferenceRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
+        super(requestUrl, client, requestOptions, <#=c.TypeCollectionResponse()#>.class, <#=c.ITypeCollectionPage()#>.class);
     }
 
-    public void post(final <#=TypeName(c)#> new<#=TypeName(c)#>, final ICallback<<#=TypeName(c)#>> callback) {
+    public void post(final <#=c.TypeName()#> new<#=c.TypeName()#>, final ICallback<<#=c.TypeName()#>> callback) {
 <#
 		var navigationProperty = c.AsOdcmProperty().GetServiceCollectionNavigationPropertyForPropertyType(((CustomT4Host)Host).CurrentModel);
 		if (navigationProperty != null) {
@@ -32,18 +32,18 @@
             String prop = c.AsOdcmProperty().GetServiceCollectionNavigationPropertyForPropertyType(((CustomT4Host)Host).CurrentModel).Name;
 #>
         final String requestUrl = getBaseRequest().getRequestUrl().toString();
-        final ReferenceRequestBody body = new ReferenceRequestBody(getBaseRequest().getClient().getServiceRoot() + "/<#=prop#>/<#=implicitNavigationProperty#>" + new<#=TypeName(c)#>.id);
-        new <#=TypeWithReferencesRequestBuilder(c)#>(requestUrl, getBaseRequest().getClient(), /* Options */ null)
+        final ReferenceRequestBody body = new ReferenceRequestBody(getBaseRequest().getClient().getServiceRoot() + "/<#=prop#>/<#=implicitNavigationProperty#>" + new<#=c.TypeName()#>.id);
+        new <#=c.TypeWithReferencesRequestBuilder()#>(requestUrl, getBaseRequest().getClient(), /* Options */ null)
             .buildRequest(getBaseRequest().getOptions())
-            .post(new<#=TypeName(c)#>, body, callback);
+            .post(new<#=c.TypeName()#>, body, callback);
     }
 
-    public <#=TypeName(c)#> post(final <#=TypeName(c)#> new<#=TypeName(c)#>) throws ClientException {
+    public <#=c.TypeName()#> post(final <#=c.TypeName()#> new<#=c.TypeName()#>) throws ClientException {
         final String requestUrl = getBaseRequest().getRequestUrl().toString();
-        final ReferenceRequestBody body = new ReferenceRequestBody(getBaseRequest().getClient().getServiceRoot() + "/<#=prop#>/<#=implicitNavigationProperty#>" + new<#=TypeName(c)#>.id);
-        return new <#=TypeWithReferencesRequestBuilder(c)#>(requestUrl,getBaseRequest().getClient(), /* Options */ null)
+        final ReferenceRequestBody body = new ReferenceRequestBody(getBaseRequest().getClient().getServiceRoot() + "/<#=prop#>/<#=implicitNavigationProperty#>" + new<#=c.TypeName()#>.id);
+        return new <#=c.TypeWithReferencesRequestBuilder()#>(requestUrl,getBaseRequest().getClient(), /* Options */ null)
                 .buildRequest(getBaseRequest().getOptions())
-                .post(new<#=TypeName(c)#>, body);
+                .post(new<#=c.TypeName()#>, body);
     }
 <#     } 
 #>
@@ -54,9 +54,9 @@
      * @param value the expand clause
      * @return the updated request
      */
-    public <#=ITypeCollectionReferenceRequest(c)#> expand(final String value) {
+    public <#=c.ITypeCollectionReferenceRequest()#> expand(final String value) {
         addQueryOption(new QueryOption("$expand", value));
-        return (<#=TypeCollectionReferenceRequest(c)#>)this;
+        return (<#=c.TypeCollectionReferenceRequest()#>)this;
     }
 
 <# } #>
@@ -67,9 +67,9 @@
      * @param value the select clause
      * @return the updated request
      */
-    public <#=ITypeCollectionReferenceRequest(c)#> select(final String value) {
+    public <#=c.ITypeCollectionReferenceRequest()#> select(final String value) {
         addQueryOption(new QueryOption("$select", value));
-        return (<#=TypeCollectionReferenceRequest(c)#>)this;
+        return (<#=c.TypeCollectionReferenceRequest()#>)this;
     }
 
 <# } #>
@@ -80,9 +80,9 @@
      * @param value the max number of items to return
      * @return the updated request
      */
-    public <#=ITypeCollectionReferenceRequest(c)#> top(final int value) {
+    public <#=c.ITypeCollectionReferenceRequest()#> top(final int value) {
         addQueryOption(new QueryOption("$top", value + ""));
-        return (<#=TypeCollectionReferenceRequest(c)#>)this;
+        return (<#=c.TypeCollectionReferenceRequest()#>)this;
     }
 <# } #>
 }

Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequest.java.tt

@@ -2,28 +2,28 @@
 <#@ template debug="true" hostspecific="true" language="C#" #>
 <#@ include file="BaseJavaModel.template.tt"#>
 <#@ output extension="\\" #>
-<#host.TemplateName = TypeCollectionReferenceRequestBuilder(c);#>
+<#host.TemplateName = c.TypeCollectionReferenceRequestBuilder();#>
 <#=writer.WriteHeader()#>
-<#=CreatePackageDef(host)#>
+<#=host.CreatePackageDef()#>
 
-<#=CreateClassDef(TypeCollectionReferenceRequestBuilder(c), "BaseRequestBuilder", ITypeCollectionReferenceRequestBuilder(c))#>
+<#=TypeHelperJava.CreateClassDef(c.TypeCollectionReferenceRequestBuilder(), "BaseRequestBuilder", c.ITypeCollectionReferenceRequestBuilder())#>
 
     /**
-     * The request builder for this collection of <#=ClassTypeName(c)#>
+     * The request builder for this collection of <#=c.ClassTypeName()#>
      *
      * @param requestUrl     the request URL
      * @param client         the service client
      * @param requestOptions the options for this request
      */
-    public <#=TypeCollectionReferenceRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
+    public <#=c.TypeCollectionReferenceRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 
-    public <#=ITypeCollectionReferenceRequest(c)#> buildRequest() {
+    public <#=c.ITypeCollectionReferenceRequest()#> buildRequest() {
         return buildRequest(getOptions());
     }
 
-    public <#=ITypeCollectionReferenceRequest(c)#> buildRequest(final java.util.List<? extends Option> requestOptions) {
-        return new <#=TypeCollectionReferenceRequest(c)#>(getRequestUrl(), getClient(), requestOptions);
+    public <#=c.ITypeCollectionReferenceRequest()#> buildRequest(final java.util.List<? extends Option> requestOptions) {
+        return new <#=c.TypeCollectionReferenceRequest()#>(getRequestUrl(), getClient(), requestOptions);
     }
 }