Skip to content

Commit 37163b7

Browse files
zenginzengin
committed
disambiguation for common types
1 parent ce40180 commit 37163b7

31 files changed

+142
-121
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @param client the service client
1616
* @param requestOptions the options for this request
1717
*/
18-
public <#=c.TypeCollectionReferenceRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
18+
public <#=c.TypeCollectionReferenceRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
1919
super(requestUrl, client, requestOptions, <#=c.TypeCollectionResponse()#>.class, <#=c.ITypeCollectionPage()#>.class);
2020
}
2121

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
* @param client the service client
1616
* @param requestOptions the options for this request
1717
*/
18-
public <#=c.TypeCollectionReferenceRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
18+
public <#=c.TypeCollectionReferenceRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
1919
super(requestUrl, client, requestOptions);
2020
}
2121

2222
public <#=c.ITypeCollectionReferenceRequest()#> buildRequest() {
2323
return buildRequest(getOptions());
2424
}
2525

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @param client the service client
1616
* @param requestOptions the options for this request
1717
*/
18-
public <#=c.TypeCollectionRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
18+
public <#=c.TypeCollectionRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
1919
super(requestUrl, client, requestOptions, <#=c.TypeCollectionResponse()#>.class, <#=c.ITypeCollectionPage()#>.class);
2020
}
2121

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
* @param client the service client
1616
* @param requestOptions the options for this request
1717
*/
18-
public <#=c.TypeCollectionRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
18+
public <#=c.TypeCollectionRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
1919
super(requestUrl, client, requestOptions);
2020
}
2121

2222
public <#=c.ITypeCollectionRequest()#> buildRequest() {
2323
return buildRequest(getOptions());
2424
}
2525

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @param client the service client
1616
* @param requestOptions the options for this request
1717
*/
18-
public <#=c.TypeCollectionWithReferencesRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
18+
public <#=c.TypeCollectionWithReferencesRequest()#>(final String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
1919
super(requestUrl, client, requestOptions, <#=c.TypeCollectionResponse()#>.class, <#=c.ITypeCollectionPage()#>.class);
2020
}
2121

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
* @param client the service client
1616
* @param requestOptions the options for this request
1717
*/
18-
public <#=c.TypeCollectionWithReferencesRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
18+
public <#=c.TypeCollectionWithReferencesRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
1919
super(requestUrl, client, requestOptions);
2020
}
2121

2222
public <#=c.ITypeCollectionWithReferencesRequest()#> buildRequest() {
2323
return buildRequest(getOptions());
2424
}
2525

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @param client the service client
1616
* @param requestOptions the options for this request
1717
*/
18-
public <#=c.TypeReferenceRequest()#>(String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, java.util.List<? extends Option> requestOptions) {
18+
public <#=c.TypeReferenceRequest()#>(String requestUrl, <#=TypeHelperJava.IBaseClientType()#> client, java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
1919
super(requestUrl, client, requestOptions, <#=c.ClassTypeName()#>.class);
2020
}
2121

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* @param client the service client
1717
* @param requestOptions the options for this request
1818
*/
19-
public <#=c.TypeReferenceRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
19+
public <#=c.TypeReferenceRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
2020
super(requestUrl, client, requestOptions);
2121
}
2222

@@ -35,7 +35,7 @@
3535
* @param requestOptions the options for this request
3636
* @return the <#=c.ITypeReferenceRequest()#> instance
3737
*/
38-
public <#=c.ITypeReferenceRequest()#> buildRequest(final java.util.List<? extends Option> requestOptions) {
38+
public <#=c.ITypeReferenceRequest()#> buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
3939
return new <#=c.TypeReferenceRequest()#>(getRequestUrl(), getClient(), requestOptions);
4040
}
4141
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ classDeclaration += c.TypeName();
3434
*/
3535
public <#=c.TypeRequest()#>(final String requestUrl,
3636
final <#=TypeHelperJava.IBaseClientType()#> client,
37-
final java.util.List<? extends Option> requestOptions,
37+
final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
3838
final Class<<# if(!host.TemplateName.Equals("EntityRequest")){ #>? extends <#}#><#=c.ClassTypeName()#>> responseClass) {
3939
super(requestUrl, client, requestOptions, responseClass);
4040
}
@@ -47,7 +47,7 @@ classDeclaration += c.TypeName();
4747
* @param client the service client
4848
* @param requestOptions the options for this request
4949
*/
50-
public <#=c.TypeRequest()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
50+
public <#=c.TypeRequest()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
5151
super(requestUrl, client, requestOptions, <#=c.ClassTypeName()#>.class);
5252
}
5353

@@ -236,19 +236,19 @@ classDeclaration += c.TypeName();
236236
sb.Append(host.CreatePackageDefinition());
237237
var importFormat = @"import {0}.{1}.{2};";
238238
sb.AppendFormat(importFormat,
239-
host.CurrentModel.GetNamespace().NamespaceName(),
239+
TypeHelperJava.CurrentNamespace(host),
240240
"requests.extensions",
241241
host.CurrentType.ITypeRequest());
242242
sb.Append("\n");
243243

244244
sb.AppendFormat(importFormat,
245-
host.CurrentModel.GetNamespace().NamespaceName(),
245+
TypeHelperJava.CurrentNamespace(host),
246246
"requests.extensions",
247247
host.CurrentType.TypeRequest());
248248
sb.Append("\n");
249249

250250
sb.AppendFormat(importFormat,
251-
host.CurrentModel.GetNamespace().NamespaceName(),
251+
TypeHelperJava.CurrentNamespace(host),
252252
"models.extensions",
253253
host.CurrentType.AsOdcmClass().TypeName());
254254
sb.Append("\n");

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import java.util.EnumSet;
1919
* @param client the service client
2020
* @param requestOptions the options for this request
2121
*/
22-
public <#=c.TypeRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends Option> requestOptions) {
22+
public <#=c.TypeRequestBuilder()#>(final String requestUrl, final <#=TypeHelperJava.IBaseClientType()#> client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
2323
super(requestUrl, client, requestOptions);
2424
}
2525

@@ -38,7 +38,7 @@ import java.util.EnumSet;
3838
* @param requestOptions the options for this request
3939
* @return the <#=c.ITypeRequest()#> instance
4040
*/
41-
public <#=c.ITypeRequest()#> buildRequest(final java.util.List<? extends Option> requestOptions) {
41+
public <#=c.ITypeRequest()#> buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
4242
return new <#=c.TypeRequest()#>(getRequestUrl(), getClient(), requestOptions);
4343
}
4444

@@ -160,12 +160,12 @@ if (c.AsOdcmClass() != null)
160160

161161
var importFormat = @"import {0}.{1}.{2};";
162162
sb.AppendFormat(importFormat,
163-
host.CurrentModel.GetNamespace().NamespaceName(),
163+
host.CurrentNamespace(),
164164
"requests.extensions",
165165
host.CurrentType.ITypeRequest());
166166
sb.Append("\n");
167167
sb.AppendFormat(importFormat,
168-
host.CurrentModel.GetNamespace().NamespaceName(),
168+
host.CurrentNamespace(),
169169
"requests.extensions",
170170
host.CurrentType.TypeRequest());
171171
sb.Append("\n");
@@ -177,25 +177,25 @@ if (c.AsOdcmClass() != null)
177177
if (prop.IsCollection()) {
178178

179179
sb.AppendFormat(importFormat,
180-
host.CurrentModel.GetNamespace().NamespaceName(),
180+
prop.Projection.Type.Namespace.Name.NamespaceName(),
181181
"requests.extensions",
182182
prop.ITypeCollectionRequestBuilder());
183183
sb.Append("\n");
184184

185185
sb.AppendFormat(importFormat,
186-
host.CurrentModel.GetNamespace().NamespaceName(),
186+
prop.Projection.Type.Namespace.Name.NamespaceName(),
187187
"requests.extensions",
188188
prop.TypeCollectionRequestBuilder());
189189
sb.Append("\n");
190190
}
191191
sb.AppendFormat(importFormat,
192-
host.CurrentModel.GetNamespace().NamespaceName(),
192+
prop.Projection.Type.Namespace.Name.NamespaceName(),
193193
"requests.extensions",
194194
prop.ITypeRequestBuilder());
195195
sb.Append("\n");
196196

197197
sb.AppendFormat(importFormat,
198-
host.CurrentModel.GetNamespace().NamespaceName(),
198+
prop.Projection.Type.Namespace.Name.NamespaceName(),
199199
"requests.extensions",
200200
prop.TypeRequestBuilder());
201201
sb.Append("\n");
@@ -205,13 +205,13 @@ if (c.AsOdcmClass() != null)
205205
{
206206
var propRequestBuilder = prop.TypeRequestBuilder();
207207
sb.AppendFormat(importFormat,
208-
host.CurrentModel.GetNamespace().NamespaceName(),
208+
prop.Projection.Type.Namespace.Name.NamespaceName(),
209209
"requests.extensions",
210210
"I" + propRequestBuilder);
211211
sb.Append("\n");
212212

213213
sb.AppendFormat(importFormat,
214-
host.CurrentModel.GetNamespace().NamespaceName(),
214+
prop.Projection.Type.Namespace.Name.NamespaceName(),
215215
"requests.extensions",
216216
propRequestBuilder);
217217
sb.Append("\n");
@@ -220,13 +220,13 @@ if (c.AsOdcmClass() != null)
220220
if (c is OdcmMediaClass)
221221
{
222222
sb.AppendFormat(importFormat,
223-
host.CurrentModel.GetNamespace().NamespaceName(),
223+
host.CurrentNamespace(),
224224
"requests.extensions",
225225
host.CurrentType.ITypeStreamRequestBuilder());
226226
sb.Append("\n");
227227

228228
sb.AppendFormat(importFormat,
229-
host.CurrentModel.GetNamespace().NamespaceName(),
229+
host.CurrentNamespace(),
230230
"requests.extensions",
231231
host.CurrentType.TypeStreamRequestBuilder());
232232
sb.Append("\n");
@@ -246,7 +246,7 @@ if (c.AsOdcmClass() != null)
246246
typeString = typeString.Substring(0, typeString.Length-1);
247247
}
248248
sb.AppendFormat(importFormat,
249-
host.CurrentModel.GetNamespace().NamespaceName(),
249+
p.Type.Namespace.Name.NamespaceName(),
250250
p.GetPackagePrefix(),
251251
typeString);
252252
sb.Append("\n");
@@ -255,25 +255,25 @@ if (c.AsOdcmClass() != null)
255255

256256
if (method.IsCollection) {
257257
sb.AppendFormat(importFormat,
258-
host.CurrentModel.GetNamespace().NamespaceName(),
258+
method.Namespace.Name.NamespaceName(),
259259
"requests.extensions",
260260
method.ITypeCollectionRequestBuilder());
261261
sb.Append("\n");
262262

263263
sb.AppendFormat(importFormat,
264-
host.CurrentModel.GetNamespace().NamespaceName(),
264+
method.Namespace.Name.NamespaceName(),
265265
"requests.extensions",
266266
method.TypeCollectionRequestBuilder());
267267
sb.Append("\n");
268268
} else {
269269
sb.AppendFormat(importFormat,
270-
host.CurrentModel.GetNamespace().NamespaceName(),
270+
method.Namespace.Name.NamespaceName(),
271271
"requests.extensions",
272272
method.ITypeRequestBuilder());
273273
sb.Append("\n");
274274

275275
sb.AppendFormat(importFormat,
276-
host.CurrentModel.GetNamespace().NamespaceName(),
276+
method.Namespace.Name.NamespaceName(),
277277
"requests.extensions",
278278
method.TypeRequestBuilder());
279279
sb.Append("\n");

0 commit comments

Comments
 (0)