Skip to content

Commit b9d490f

Browse files
baywetbaywet
authored
Merge pull request #278 from microsoftgraph/bugfix/java-stream-properties
java selective imports + a bunch of bugfixes + namespace fixes
2 parents 01701e3 + 824cfc5 commit b9d490f

File tree

302 files changed

+2511
-2069
lines changed

Some content is hidden

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

302 files changed

+2511
-2069
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
import com.google.gson.JsonObject;
1010
import com.google.gson.JsonElement;
11-
import com.google.gson.annotations.*;
11+
import com.google.gson.annotations.SerializedName;
12+
import com.google.gson.annotations.Expose;
1213
import java.util.HashMap;
1314
import java.util.Map;
1415

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@
55
<#host.TemplateName = c.TypeBody();#>
66
<#=writer.WriteHeader()#>
77
<#=host.CreatePackageDefinition()#>
8-
<#
9-
var sb = new StringBuilder();
10-
sb = TypeHelperJava.ImportClassesOfMethodParameters(c.AsOdcmMethod(), "import {0}.{1}.{2};", sb);
11-
#>
12-
<#=sb.ToString()#>
8+
<#=TypeHelperJava.ImportClassesOfMethodParametersAsString(c.AsOdcmMethod())#>
9+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
1310
import com.google.gson.annotations.Expose;
1411
import com.google.gson.annotations.SerializedName;
1512
import com.google.gson.JsonObject;
16-
import com.microsoft.graph.serializer.ISerializer;
13+
import <#=importNamespace#>.serializer.ISerializer;
1714
import java.util.EnumSet;
1815

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

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

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

810
<#=TypeHelperJava.CreateInterfaceDef(c.IBaseClientType(host), "IBaseClient")#>
911
<#

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<#=writer.WriteHeader()#>
77
<#=host.CreatePackageDef()#>
88
import com.google.gson.JsonObject;
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;
913

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

‎Templates/Java/models_generated/Enum.java.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public enum <#= c.Name.ToUpperFirstChar()#>
1212
{
1313
<#
14-
foreach(var value in c.AsOdcmEnum().Members)
14+
foreach(var value in c.AsOdcmEnum().Members.GroupBy(x => x.Name.ToUnderscore().ToUpper()).Select(x => x.First()).ToList())
1515
{
1616
#>
1717
/**

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

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

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

1013
/**
1114
* The default endpoint for the Microsoft Graph Service
1215
*/
13-
public static final String DEFAULT_GRAPH_ENDPOINT = "https://graph.microsoft.com/v1.0";
16+
public static final String DEFAULT_GRAPH_ENDPOINT = "<#=ConfigurationService.Settings.DefaultBaseEndpointUrl#>";
1417

1518
/**
1619
* The current endpoint
@@ -43,7 +46,7 @@ foreach (var prop in model.EntityContainer.Properties)
4346
* @return the request builder for the collection of <#=propertyName#> objects
4447
*/
4548
public <#=prop.ITypeCollectionRequestBuilder()#> <#=prop.Name#>() {
46-
return new <#=prop.TypeCollectionRequestBuilder()#>(getServiceRoot() + "/<#=prop.Name#>", (<#=c.IClientType(host)#>)this, null);
49+
return new <#=prop.TypeCollectionRequestBuilder()#>(getServiceRoot() + "/<#=prop.Name#>", this, null);
4750
}
4851

4952
/**
@@ -53,7 +56,7 @@ foreach (var prop in model.EntityContainer.Properties)
5356
* @return the request builder for the <#=propertyName#> object
5457
*/
5558
public <#=prop.ITypeRequestBuilder()#> <#=prop.Name#>(final String id) {
56-
return new <#=prop.TypeRequestBuilder()#>(getServiceRoot() + "/<#=prop.Name#>/" + id, (<#=c.IClientType(host)#>)this, null);
59+
return new <#=prop.TypeRequestBuilder()#>(getServiceRoot() + "/<#=prop.Name#>/" + id, this, null);
5760
}
5861
<#
5962
}
@@ -67,7 +70,7 @@ foreach (var prop in model.EntityContainer.Properties)
6770
* @return the <#=prop.Projection.Type.GetTypeString()#>
6871
*/
6972
public <#=prop.ITypeRequestBuilder()#> <#=prop.Name#>() {
70-
return new <#=prop.TypeRequestBuilder()#>(getServiceRoot() + "/<#=prop.Name#>", (<#=c.IClientType(host)#>)this, null);
73+
return new <#=prop.TypeRequestBuilder()#>(getServiceRoot() + "/<#=prop.Name#>", this, null);
7174
}
7275
<#
7376
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
<#host.TemplateName = c.TypeCollectionPage();#>
66
<#=writer.WriteHeader()#>
77
<#=host.CreatePackageDefForBaseEntityCollectionPage()#>
8-
import com.microsoft.graph.http.BaseCollectionPage;
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()#>;
913

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

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

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

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()#>;
16+
917
<#=TypeHelperJava.CreateClassDef(c.TypeCollectionReferenceRequest(), "BaseCollectionRequest" + c.CollectionRequestGeneric(), c.ITypeCollectionReferenceRequest())#>
1018

1119
/**
@@ -15,7 +23,7 @@
1523
* @param client the service client
1624
* @param requestOptions the options for this request
1725
*/
18-
public <#=c.TypeCollectionReferenceRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
26+
public <#=c.TypeCollectionReferenceRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
1927
super(requestUrl, client, requestOptions, <#=c.TypeCollectionResponse()#>.class, <#=c.ITypeCollectionPage()#>.class);
2028
}
2129

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

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

9+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
10+
import <#=importNamespace#>.http.BaseRequestBuilder;
11+
import <#=importNamespace#>.core.IBaseClient;
12+
913
<#=TypeHelperJava.CreateClassDef(c.TypeCollectionReferenceRequestBuilder(), "BaseRequestBuilder", c.ITypeCollectionReferenceRequestBuilder())#>
1014

1115
/**
@@ -15,15 +19,15 @@
1519
* @param client the service client
1620
* @param requestOptions the options for this request
1721
*/
18-
public <#=c.TypeCollectionReferenceRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
22+
public <#=c.TypeCollectionReferenceRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
1923
super(requestUrl, client, requestOptions);
2024
}
2125

2226
public <#=c.ITypeCollectionReferenceRequest()#> buildRequest() {
2327
return buildRequest(getOptions());
2428
}
2529

26-
public <#=c.ITypeCollectionReferenceRequest()#> buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
30+
public <#=c.ITypeCollectionReferenceRequest()#> buildRequest(final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
2731
return new <#=c.TypeCollectionReferenceRequest()#>(getRequestUrl(), getClient(), requestOptions);
2832
}
2933
}

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

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

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()#>;
20+
921
<#=TypeHelperJava.CreateClassDef(c.TypeCollectionRequest(), "BaseCollectionRequest" + c.CollectionRequestGeneric(), c.ITypeCollectionRequest())#>
1022

1123
/**
@@ -15,7 +27,7 @@
1527
* @param client the service client
1628
* @param requestOptions the options for this request
1729
*/
18-
public <#=c.TypeCollectionRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
30+
public <#=c.TypeCollectionRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
1931
super(requestUrl, client, requestOptions, <#=c.TypeCollectionResponse()#>.class, <#=c.ITypeCollectionPage()#>.class);
2032
}
2133

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

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

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()#>;
13+
<#
14+
var currentTypeProjection = c.AsOdcmProperty().Projection.Type.AsOdcmClass();
15+
if (currentTypeProjection != null) {
16+
foreach (var method in currentTypeProjection.MethodsAndOverloads()) {
17+
if (!method.IsBoundToCollection) {
18+
continue;
19+
}
20+
if (method.IsCollection) {
21+
#>
22+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=method.ITypeCollectionRequestBuilder()#>;
23+
<#
24+
} else {
25+
#>
26+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=method.ITypeRequestBuilder()#>;
27+
<#
28+
}
29+
}
30+
}
31+
#>
32+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
33+
import <#=importNamespace#>.http.BaseRequestBuilder;
34+
import <#=importNamespace#>.core.IBaseClient;
35+
936
<#=TypeHelperJava.CreateClassDef(c.TypeCollectionRequestBuilder(), "BaseRequestBuilder", c.ITypeCollectionRequestBuilder())#>
1037

1138
/**
@@ -15,15 +42,15 @@
1542
* @param client the service client
1643
* @param requestOptions the options for this request
1744
*/
18-
public <#=c.TypeCollectionRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
45+
public <#=c.TypeCollectionRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
1946
super(requestUrl, client, requestOptions);
2047
}
2148

2249
public <#=c.ITypeCollectionRequest()#> buildRequest() {
2350
return buildRequest(getOptions());
2451
}
2552

26-
public <#=c.ITypeCollectionRequest()#> buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
53+
public <#=c.ITypeCollectionRequest()#> buildRequest(final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
2754
return new <#=c.TypeCollectionRequest()#>(getRequestUrl(), getClient(), requestOptions);
2855
}
2956

@@ -40,7 +67,6 @@
4067
<# } #>
4168

4269
<#
43-
var currentTypeProjection = c.AsOdcmProperty().Projection.Type.AsOdcmClass();
4470
if (currentTypeProjection != null) {
4571
foreach (var method in currentTypeProjection.MethodsAndOverloads()) {
4672

‎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 com.microsoft.graph.serializer.AdditionalDataManager;
13-
import com.microsoft.graph.serializer.IJsonBackedObject;
14-
import com.microsoft.graph.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

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

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

9+
<# var mainNamespace = host.CurrentNamespace(); #>
10+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequestBuilder()#>;
11+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionWithReferencesPage()#>;
12+
import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCollectionResponse()#>;
13+
import <#=mainNamespace#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
914
import com.google.gson.JsonObject;
10-
import com.google.gson.annotations.*;
15+
import com.google.gson.annotations.SerializedName;
16+
import com.google.gson.annotations.Expose;
17+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
18+
import <#=importNamespace#>.http.BaseCollectionPage;
1119

1220
<#=TypeHelperJava.CreateClassDef(c.TypeCollectionWithReferencesPage(), "BaseCollectionPage" + c.CollectionPageWithReferencesGeneric(), c.ITypeCollectionWithReferencesPage())#>
1321

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

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

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+
915
<#=TypeHelperJava.CreateClassDef(c.TypeCollectionWithReferencesRequest(), "BaseCollectionRequest" + c.CollectionRequestGeneric(), c.ITypeCollectionWithReferencesRequest())#>
1016

1117
/**
@@ -15,7 +21,7 @@
1521
* @param client the service client
1622
* @param requestOptions the options for this request
1723
*/
18-
public <#=c.TypeCollectionWithReferencesRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
24+
public <#=c.TypeCollectionWithReferencesRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
1925
super(requestUrl, client, requestOptions, <#=c.TypeCollectionResponse()#>.class, <#=c.ITypeCollectionPage()#>.class);
2026
}
2127

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

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

9+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
10+
import <#=importNamespace#>.http.BaseRequestBuilder;
11+
import <#=importNamespace#>.core.IBaseClient;
12+
913
<#=TypeHelperJava.CreateClassDef(c.TypeCollectionWithReferencesRequestBuilder(), "BaseRequestBuilder", c.ITypeCollectionWithReferencesRequestBuilder())#>
1014

1115
/**
@@ -15,15 +19,15 @@
1519
* @param client the service client
1620
* @param requestOptions the options for this request
1721
*/
18-
public <#=c.TypeCollectionWithReferencesRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
22+
public <#=c.TypeCollectionWithReferencesRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
1923
super(requestUrl, client, requestOptions);
2024
}
2125

2226
public <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest() {
2327
return buildRequest(getOptions());
2428
}
2529

26-
public <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
30+
public <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest(final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
2731
return new <#=c.TypeCollectionWithReferencesRequest()#>(getRequestUrl(), getClient(), requestOptions);
2832
}
2933

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

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

9+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
10+
import <#=importNamespace#>.options.QueryOption;
11+
import <#=importNamespace#>.http.BaseRequest;
12+
import <#=importNamespace#>.http.HttpMethod;
13+
import <#=importNamespace#>.core.IBaseClient;
14+
915
<#=TypeHelperJava.CreateClassDef(c.TypeReferenceRequest(), "BaseRequest", c.ITypeReferenceRequest())#>
1016

1117
/**
@@ -15,7 +21,7 @@
1521
* @param client the service client
1622
* @param requestOptions the options for this request
1723
*/
18-
public <#=c.TypeReferenceRequest()#>(String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
24+
public <#=c.TypeReferenceRequest()#>(String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
1925
super(requestUrl, client, requestOptions, <#=c.ClassTypeName()#>.class);
2026
}
2127

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

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

10+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
11+
import <#=importNamespace#>.http.BaseRequestBuilder;
12+
import <#=importNamespace#>.core.IBaseClient;
13+
1014
<#=TypeHelperJava.CreateClassDef(c.TypeReferenceRequestBuilder(), "BaseRequestBuilder", c.ITypeReferenceRequestBuilder())#>
1115

1216
/**
@@ -16,7 +20,7 @@
1620
* @param client the service client
1721
* @param requestOptions the options for this request
1822
*/
19-
public <#=c.TypeReferenceRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
23+
public <#=c.TypeReferenceRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
2024
super(requestUrl, client, requestOptions);
2125
}
2226

@@ -35,7 +39,7 @@
3539
* @param requestOptions the options for this request
3640
* @return the <#=c.ITypeReferenceRequest()#> instance
3741
*/
38-
public <#=c.ITypeReferenceRequest()#> buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
42+
public <#=c.ITypeReferenceRequest()#> buildRequest(final java.util.List<? extends <#=importNamespace#>.options.Option> requestOptions) {
3943
return new <#=c.TypeReferenceRequest()#>(getRequestUrl(), getClient(), requestOptions);
4044
}
4145
}

0 commit comments

Comments
 (0)