Skip to content

Commit 3008c68

Browse files
baywetbaywet
committed
- uses variables for namespaces for faster generation time
1 parent ba2ef67 commit 3008c68

49 files changed

Lines changed: 265 additions & 196 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Templates/Java/models_extensions/BaseMethodBody.java.tt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
<#=writer.WriteHeader()#>
77
<#=host.CreatePackageDefinition()#>
88
<#=TypeHelperJava.ImportClassesOfMethodParametersAsString(c.AsOdcmMethod())#>
9+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
910
import com.google.gson.annotations.Expose;
1011
import com.google.gson.annotations.SerializedName;
1112
import com.google.gson.JsonObject;
12-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.serializer.ISerializer;
13+
import <#=importNamespace#>.serializer.ISerializer;
1314
import java.util.EnumSet;
1415

1516
<#=TypeHelperJava.CreateClassDef(c.TypeBody())#>

‎Templates/Java/models_extensions/IBaseClient.java.tt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<#@ output extension="\\" #>
55
<#=writer.WriteHeader()#>
66
<#=host.CreatePackageDef()#>
7-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
7+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
8+
import <#=importNamespace#>.core.IBaseClient;
89

910
<#=TypeHelperJava.CreateInterfaceDef(c.IBaseClientType(host), "IBaseClient")#>
1011
<#

‎Templates/Java/models_extensions/IClient.java.tt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
<#=writer.WriteHeader()#>
77
<#=host.CreatePackageDef()#>
88
import com.google.gson.JsonObject;
9-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.<#=c.GetPackagePrefix()#>.<#=c.IBaseClientType(host)#>;
10-
import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.CustomRequestBuilder;
9+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
10+
import <#=importNamespace#>.<#=c.GetPackagePrefix()#>.<#=c.IBaseClientType(host)#>;
11+
<# var mainNamespace = host.CurrentNamespace(); #>
12+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.CustomRequestBuilder;
1113

1214
<#=TypeHelperJava.CreateInterfaceDef(c.IClientType(host), c.IBaseClientType(host))#>
1315
<# if(host.TemplateName.Equals("IGraphServiceClient")){ #>

‎Templates/Java/requests_extensions/BaseClient.java.tt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
<#@ output extension="\\" #>
55
<#=writer.WriteHeader()#>
66
<#=host.CreatePackageDef()#>
7-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.models.extensions.<#=c.IBaseClientType(host)#>;
8-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.BaseClient;
7+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
8+
import <#=importNamespace#>.models.extensions.<#=c.IBaseClientType(host)#>;
9+
import <#=importNamespace#>.core.BaseClient;
910

1011
<#=TypeHelperJava.CreateClassDef(c.BaseClientType(host), "BaseClient", c.IBaseClientType(host))#>
1112

‎Templates/Java/requests_extensions/BaseEntityCollectionPage.java.tt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
<#host.TemplateName = c.TypeCollectionPage();#>
66
<#=writer.WriteHeader()#>
77
<#=host.CreatePackageDefForBaseEntityCollectionPage()#>
8-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseCollectionPage;
9-
import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCollectionPage()#>;
10-
import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCollectionResponse()#>;
8+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
9+
import <#=importNamespace#>.http.BaseCollectionPage;
10+
<# var mainNamespace = host.CurrentNamespace(); #>
11+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCollectionPage()#>;
12+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCollectionResponse()#>;
1113

1214
<#=TypeHelperJava.CreateClassDef(c.TypeCollectionPage(), "BaseCollectionPage" + c.CollectionPageGeneric(), c.ITypeCollectionPage())#>
1315
<#

‎Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequest.java.tt‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
<#=writer.WriteHeader()#>
77
<#=host.CreatePackageDef()#>
88

9-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.QueryOption;
10-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
11-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseCollectionRequest;
12-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.ReferenceRequestBody;
13-
import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
9+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
10+
import <#=importNamespace#>.options.QueryOption;
11+
import <#=importNamespace#>.core.IBaseClient;
12+
import <#=importNamespace#>.http.BaseCollectionRequest;
13+
import <#=importNamespace#>.http.ReferenceRequestBody;
14+
<# var mainNamespace = host.CurrentNamespace(); #>
15+
import <#=mainNamespace#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
1416

1517
<#=TypeHelperJava.CreateClassDef(c.TypeCollectionReferenceRequest(), "BaseCollectionRequest" + c.CollectionRequestGeneric(), c.ITypeCollectionReferenceRequest())#>
1618

@@ -21,7 +23,7 @@ import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
2123
* @param client the service client
2224
* @param requestOptions the options for this request
2325
*/
24-
public <#=c.TypeCollectionReferenceRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
26+
public <#=c.TypeCollectionReferenceRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
2527
super(requestUrl, client, requestOptions, <#=c.TypeCollectionResponse()#>.class, <#=c.ITypeCollectionPage()#>.class);
2628
}
2729

‎Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequestBuilder.java.tt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
<#=writer.WriteHeader()#>
77
<#=host.CreatePackageDef()#>
88

9-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseRequestBuilder;
10-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
9+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
10+
import <#=importNamespace#>.http.BaseRequestBuilder;
11+
import <#=importNamespace#>.core.IBaseClient;
1112

1213
<#=TypeHelperJava.CreateClassDef(c.TypeCollectionReferenceRequestBuilder(), "BaseRequestBuilder", c.ITypeCollectionReferenceRequestBuilder())#>
1314

@@ -18,15 +19,15 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
1819
* @param client the service client
1920
* @param requestOptions the options for this request
2021
*/
21-
public <#=c.TypeCollectionReferenceRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
22+
public <#=c.TypeCollectionReferenceRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
2223
super(requestUrl, client, requestOptions);
2324
}
2425

2526
public <#=c.ITypeCollectionReferenceRequest()#> buildRequest() {
2627
return buildRequest(getOptions());
2728
}
2829

29-
public <#=c.ITypeCollectionReferenceRequest()#> buildRequest(final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
30+
public <#=c.ITypeCollectionReferenceRequest()#> buildRequest(final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
3031
return new <#=c.TypeCollectionReferenceRequest()#>(getRequestUrl(), getClient(), requestOptions);
3132
}
3233
}

‎Templates/Java/requests_extensions/BaseEntityCollectionRequest.java.tt‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@
66
<#=writer.WriteHeader()#>
77
<#=host.CreatePackageDef()#>
88

9-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.QueryOption;
10-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
11-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseCollectionRequest;
12-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.IExecutors;
13-
import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionPage()#>;
14-
import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCollectionResponse()#>;
15-
import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequestBuilder()#>;
16-
import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequest()#>;
17-
import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCollectionPage()#>;
9+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
10+
import <#=importNamespace#>.options.QueryOption;
11+
import <#=importNamespace#>.core.IBaseClient;
12+
import <#=importNamespace#>.http.BaseCollectionRequest;
13+
import <#=importNamespace#>.concurrency.IExecutors;
14+
<# var mainNamespace = host.CurrentNamespace(); #>
15+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionPage()#>;
16+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCollectionResponse()#>;
17+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequestBuilder()#>;
18+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequest()#>;
19+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCollectionPage()#>;
1820

1921
<#=TypeHelperJava.CreateClassDef(c.TypeCollectionRequest(), "BaseCollectionRequest" + c.CollectionRequestGeneric(), c.ITypeCollectionRequest())#>
2022

@@ -25,7 +27,7 @@ import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<
2527
* @param client the service client
2628
* @param requestOptions the options for this request
2729
*/
28-
public <#=c.TypeCollectionRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
30+
public <#=c.TypeCollectionRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
2931
super(requestUrl, client, requestOptions, <#=c.TypeCollectionResponse()#>.class, <#=c.ITypeCollectionPage()#>.class);
3032
}
3133

‎Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
<#=writer.WriteHeader()#>
77
<#=host.CreatePackageDef()#>
88

9-
import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequestBuilder()#>;
10-
import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeRequestBuilder()#>;
11-
import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequest()#>;
9+
<# var mainNamespace = host.CurrentNamespace(); #>
10+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequestBuilder()#>;
11+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeRequestBuilder()#>;
12+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequest()#>;
1213
<#
1314
var currentTypeProjection = c.AsOdcmProperty().Projection.Type.AsOdcmClass();
1415
if (currentTypeProjection != null) {
@@ -18,18 +19,19 @@ if (currentTypeProjection != null) {
1819
}
1920
if (method.IsCollection) {
2021
#>
21-
import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=method.ITypeCollectionRequestBuilder()#>;
22+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=method.ITypeCollectionRequestBuilder()#>;
2223
<#
2324
} else {
2425
#>
25-
import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=method.ITypeRequestBuilder()#>;
26+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=method.ITypeRequestBuilder()#>;
2627
<#
2728
}
2829
}
2930
}
3031
#>
31-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseRequestBuilder;
32-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
32+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
33+
import <#=importNamespace#>.http.BaseRequestBuilder;
34+
import <#=importNamespace#>.core.IBaseClient;
3335

3436
<#=TypeHelperJava.CreateClassDef(c.TypeCollectionRequestBuilder(), "BaseRequestBuilder", c.ITypeCollectionRequestBuilder())#>
3537

@@ -40,15 +42,15 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
4042
* @param client the service client
4143
* @param requestOptions the options for this request
4244
*/
43-
public <#=c.TypeCollectionRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
45+
public <#=c.TypeCollectionRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
4446
super(requestUrl, client, requestOptions);
4547
}
4648

4749
public <#=c.ITypeCollectionRequest()#> buildRequest() {
4850
return buildRequest(getOptions());
4951
}
5052

51-
public <#=c.ITypeCollectionRequest()#> buildRequest(final java.util.List<? extends <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option> requestOptions) {
53+
public <#=c.ITypeCollectionRequest()#> buildRequest(final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
5254
return new <#=c.TypeCollectionRequest()#>(getRequestUrl(), getClient(), requestOptions);
5355
}
5456

‎Templates/Java/requests_extensions/BaseEntityCollectionResponse.java.tt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ import com.google.gson.JsonArray;
99
import com.google.gson.JsonObject;
1010
import com.google.gson.annotations.Expose;
1111
import com.google.gson.annotations.SerializedName;
12-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.serializer.AdditionalDataManager;
13-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.serializer.IJsonBackedObject;
14-
import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.serializer.ISerializer;
12+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
13+
import <#=importNamespace#>.serializer.AdditionalDataManager;
14+
import <#=importNamespace#>.serializer.IJsonBackedObject;
15+
import <#=importNamespace#>.serializer.ISerializer;
1516

1617
<#=TypeHelperJava.CreateClassDef(c.TypeCollectionResponse(), null, "IJsonBackedObject")#>
1718

0 commit comments

Comments
 (0)