Skip to content

Java template fix to reduce memory footprint - continued #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepak2016 merged 4 commits into from
Jun 27, 2018
Merged

Java template fix to reduce memory footprint - continued #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
559f045
Fixing BaseMethodRequest template import statements. This template ge…
deepak2016 Jun 26, 2018
7a531fa
Fixing IBaseMethodRequest template import statements. This template g…
deepak2016 Jun 26, 2018
cd9fea2
Refactoring package definition code for BaseMethodRequest to utilize …
deepak2016 Jun 26, 2018
8f821d8
Fixing IBaseEntityRequest template import statements. This template g…
deepak2016 Jun 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions Templates/Java/BaseJavaModel.template.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,56 @@
return sb.ToString();
}

public string CreatePackageDefForIBaseMethodRequest(CustomT4Host host)
{
var sb = new StringBuilder();
sb.Append(CreatePackageDefinition(host));
var importFormat = @"import {0}.{1}.{2};";

var returnType = ReturnType(host.CurrentType);
if(returnType != "Void" && !(host.CurrentType.AsOdcmMethod().ReturnType is OdcmPrimitiveType))
{
sb.AppendFormat(importFormat,
host.CurrentModel.NamespaceName(),
"models.extensions",
ReturnType(host.CurrentType));
sb.Append("\n");
}

sb.AppendFormat(importFormat,
host.CurrentModel.NamespaceName(),
"requests.extensions",
ITypeRequest(host.CurrentType));
sb.Append("\n");
return sb.ToString();
}

public string CreatePackageDefForIBaseEntityRequest(CustomT4Host host)
{
var sb = new StringBuilder();
sb.Append(CreatePackageDefinition(host));
var importFormat = @"import {0}.{1}.{2};";
sb.AppendFormat(importFormat,
host.CurrentModel.NamespaceName(),
"models.extensions",
TypeName(host.CurrentType.AsOdcmClass()));
sb.Append("\n");
return sb.ToString();
}

public string CreatePackageDefForBaseMethodRequest(CustomT4Host host)
{
var sb = new StringBuilder();
sb.Append(CreatePackageDefForIBaseMethodRequest(host));
var importFormat = @"import {0}.{1}.{2};";
sb.AppendFormat(importFormat,
host.CurrentModel.NamespaceName(),
"requests.extensions",
TypeRequest(host.CurrentType));
sb.Append("\n");
return sb.ToString();
}

public string CreatePackageDefForBaseMethodRequestBuilder(CustomT4Host host)
{
var sb = new StringBuilder();
Expand Down
10 changes: 9 additions & 1 deletion Templates/Java/requests_generated/BaseMethodRequest.java.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@
<#@ output extension="\\" #>
<#host.TemplateName = BaseTypeRequest(c);#>
<#=writer.WriteHeader()#>
<#=CreatePackageDef(host)#>
<#=CreatePackageDefForBaseMethodRequest(host)#>
import com.microsoft.graph.concurrency.ICallback;
import com.microsoft.graph.concurrency.IExecutors;
import com.microsoft.graph.core.ClientException;
import com.microsoft.graph.core.IBaseClient;
import com.microsoft.graph.http.BaseRequest;
import com.microsoft.graph.http.HttpMethod;
import com.microsoft.graph.options.Option;
import com.microsoft.graph.options.QueryOption;

<#=CreateClassDef(BaseTypeRequest(c), "BaseRequest", IBaseTypeRequest(c))#>

Expand Down
5 changes: 4 additions & 1 deletion Templates/Java/requests_generated/IBaseEntityRequest.java.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
<#@ output extension="\\" #>
<#host.TemplateName = IBaseTypeRequest(c);#>
<#=writer.WriteHeader()#>
<#=CreatePackageDef(host)#>
<#=CreatePackageDefForIBaseEntityRequest(host)#>
import com.microsoft.graph.concurrency.ICallback;
import com.microsoft.graph.core.ClientException;
import com.microsoft.graph.http.IHttpRequest;

<#=CreateInterfaceDef(IBaseTypeRequest(c), "IHttpRequest")#>

Expand Down
13 changes: 9 additions & 4 deletions Templates/Java/requests_generated/IBaseMethodRequest.java.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@
<#@ output extension="\\" #>
<#host.TemplateName = IBaseTypeRequest(c);#>
<#=writer.WriteHeader()#>
<#=CreatePackageDef(host)#>

import com.google.gson.JsonObject;
import com.google.gson.annotations.*;
<#=CreatePackageDefForIBaseMethodRequest(host)#>
import com.microsoft.graph.concurrency.ICallback;
import com.microsoft.graph.concurrency.IExecutors;
import com.microsoft.graph.core.ClientException;
import com.microsoft.graph.core.IBaseClient;
import com.microsoft.graph.http.BaseRequest;
import com.microsoft.graph.http.HttpMethod;
import com.microsoft.graph.options.Option;
import com.microsoft.graph.options.QueryOption;

<#=CreateInterfaceDef(IBaseTypeRequest(c))#>

Expand Down