Skip to content

Java template fix to reduce memory footprint - continued #137

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 2 commits into from
Jun 23, 2018
Merged

Java template fix to reduce memory footprint - continued #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
166fb57
Fixing BaseMethodBodyRequest template import statements. This templat…
deepak2016 Jun 22, 2018
9dc6afb
Fixing IBaseMethodBodyRequest template import statements. This templa…
deepak2016 Jun 22, 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
86 changes: 86 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 @@ -567,6 +567,92 @@
return sb.ToString();
}

public string CreatePackageDefForIBaseMethodBodyRequest(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");
}
if(host.CurrentType.AsOdcmMethod().IsCollection)
{
sb.AppendFormat(importFormat,
host.CurrentModel.NamespaceName(),
"requests.extensions",
ITypeCollectionRequest(host.CurrentType));
sb.Append("\n");
}
else
{
sb.AppendFormat(importFormat,
host.CurrentModel.NamespaceName(),
"requests.extensions",
ITypeRequest(host.CurrentType));
sb.Append("\n");
}

return sb.ToString();
}

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

sb.AppendFormat(importFormat,
host.CurrentModel.NamespaceName(),
"models.extensions",
TypeBody(host.CurrentType));
sb.Append("\n");
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");
}

if(host.CurrentType.AsOdcmMethod().IsCollection)
{
sb.AppendFormat(importFormat,
host.CurrentModel.NamespaceName(),
"requests.extensions",
ITypeCollectionRequest(host.CurrentType));
sb.Append("\n");

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

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

public string CreatePackageDefIBaseMethodRequestBuilder(CustomT4Host host)
{
var sb = new StringBuilder();
Expand Down
21 changes: 20 additions & 1 deletion Templates/Java/requests_generated/BaseMethodBodyRequest.java.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,26 @@
#>
<#host.TemplateName = baseTypeRequest;#>
<#=writer.WriteHeader()#>
<#=CreatePackageDef(host)#>
<#=CreatePackageDefForBaseMethodBodyRequest(host)#>
import com.microsoft.graph.concurrency.ICallback;
import com.microsoft.graph.core.ClientException;
import com.microsoft.graph.core.IBaseClient;
import com.microsoft.graph.options.Option;
import com.microsoft.graph.options.QueryOption;
<#
if (c.AsOdcmMethod().IsCollection) {
#>
import com.microsoft.graph.concurrency.IExecutors;
import com.microsoft.graph.http.BaseCollectionRequest;
<#
}
else {
#>
import com.microsoft.graph.http.BaseRequest;
import com.microsoft.graph.http.HttpMethod;
<#
}
#>

<#=CreateClassDef(baseTypeRequest, baseClass, iBaseTypeRequest)#>
protected final <#=TypeBody(c)#> body;
Expand Down
7 changes: 3 additions & 4 deletions Templates/Java/requests_generated/IBaseMethodBodyRequest.java.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@
#>
<#host.TemplateName = iBaseTypeRequest;#>
<#=writer.WriteHeader()#>
<#=CreatePackageDef(host)#>

import com.google.gson.JsonObject;
import com.google.gson.annotations.*;
<#=CreatePackageDefForIBaseMethodBodyRequest(host)#>
import com.microsoft.graph.concurrency.ICallback;
import com.microsoft.graph.core.ClientException;

<#=CreateInterfaceDef(iBaseTypeRequest)#>

Expand Down