Skip to content

Commit 8dfd3b2

Browse files
committed
- fixes an issue where a lot of generated java code would be missing imports
1 parent 0b005bc commit 8dfd3b2

File tree

34 files changed

+254
-7
lines changed

34 files changed

+254
-7
lines changed

Templates/Java/models_extensions/BaseEntity.java.tt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
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;
15+
import com.microsoft.graph.serializer.AdditionalDataManager;
1416

1517
<#=CreateClassDef(TypeName(c), BaseClassName(c), "IJsonBackedObject")#>
1618

Templates/Java/models_extensions/BaseMethodBody.java.tt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,14 @@
55
<#host.TemplateName = TypeBody(c);#>
66
<#=writer.WriteHeader()#>
77
<#=CreatePackageDefinition(host)#>
8-
import com.microsoft.graph.models.generated.*;
8+
<#
9+
var parameterList = MethodParametersImports(c.AsOdcmMethod());
10+
if (parameterList != "") {
11+
#>
12+
<#=parameterList#>
13+
<#
14+
}
15+
#>
916
import com.google.gson.annotations.Expose;
1017
import com.google.gson.annotations.SerializedName;
1118
import com.google.gson.JsonObject;

Templates/Java/requests_extensions/BaseEntityCollectionPage.java.tt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<#=writer.WriteHeader()#>
77
<#=CreatePackageDefForBaseEntityCollectionPage(host)#>
88
import com.microsoft.graph.http.BaseCollectionPage;
9+
import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequestBuilder(c)#>;
10+
import com.microsoft.graph.requests.extensions.<#=TypeCollectionPage(c)#>;
11+
import com.microsoft.graph.requests.extensions.<#=TypeCollectionResponse(c)#>;
12+
import com.microsoft.graph.models.extensions.<#=TypeName(c)#>;
913

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

Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequest.java.tt

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

9+
import com.microsoft.graph.core.ClientException;
10+
import com.microsoft.graph.options.QueryOption;
11+
import com.microsoft.graph.options.Option;
12+
import com.microsoft.graph.core.IBaseClient;
13+
import com.microsoft.graph.http.BaseCollectionRequest;
14+
import com.microsoft.graph.http.ReferenceRequestBody;
15+
import com.microsoft.graph.models.extensions.<#=TypeName(c)#>;
16+
import com.microsoft.graph.concurrency.ICallback;
17+
918
<#=CreateClassDef(TypeCollectionReferenceRequest(c), "BaseCollectionRequest" + CollectionRequestGeneric(c), ITypeCollectionReferenceRequest(c))#>
1019

1120
/**

Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequestBuilder.java.tt

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

9+
import com.microsoft.graph.options.Option;
10+
import com.microsoft.graph.http.BaseRequestBuilder;
11+
import com.microsoft.graph.core.IBaseClient;
12+
913
<#=CreateClassDef(TypeCollectionReferenceRequestBuilder(c), "BaseRequestBuilder", ITypeCollectionReferenceRequestBuilder(c))#>
1014

1115
/**

Templates/Java/requests_extensions/BaseEntityCollectionRequest.java.tt

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

9+
import com.microsoft.graph.core.ClientException;
10+
import com.microsoft.graph.options.Option;
11+
import com.microsoft.graph.options.QueryOption;
12+
import com.microsoft.graph.core.IBaseClient;
13+
import com.microsoft.graph.http.BaseCollectionRequest;
14+
import com.microsoft.graph.concurrency.ICallback;
15+
import com.microsoft.graph.concurrency.IExecutors;
16+
import com.microsoft.graph.models.extensions.<#=TypeName(c)#>;
17+
import com.microsoft.graph.requests.extensions.<#=ITypeCollectionPage(c)#>;
18+
import com.microsoft.graph.requests.extensions.<#=TypeCollectionResponse(c)#>;
19+
import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequestBuilder(c)#>;
20+
import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequest(c)#>;
21+
import com.microsoft.graph.requests.extensions.<#=TypeCollectionPage(c)#>;
22+
923
<#=CreateClassDef(TypeCollectionRequest(c), "BaseCollectionRequest" + CollectionRequestGeneric(c), ITypeCollectionRequest(c))#>
1024

1125
/**

Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt

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

9+
import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequestBuilder(c)#>;
10+
import com.microsoft.graph.requests.extensions.<#=ITypeRequestBuilder(c)#>;
11+
import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequest(c)#>;
12+
<#
13+
var currentTypeProjection = c.AsOdcmProperty().Projection.Type.AsOdcmClass();
14+
if (currentTypeProjection != null) {
15+
foreach (var method in currentTypeProjection.MethodsAndOverloads()) {
16+
if (!method.IsBoundToCollection) {
17+
continue;
18+
}
19+
20+
var parameterList = MethodParametersImports(method);
21+
if (parameterList != "") {
22+
#>
23+
<#=parameterList#>
24+
<#
25+
}
26+
if (method.IsCollection) {
27+
#>
28+
import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequestBuilder(method)#>;
29+
<#
30+
} else {
31+
#>
32+
import com.microsoft.graph.requests.extensions.<#=ITypeRequestBuilder(method)#>;
33+
<#
34+
}
35+
}
36+
}
37+
#>
38+
<# if (ShouldIncludeCollectionTypeReference(c)) { #>
39+
import com.microsoft.graph.models.extensions.<#=TargetCollectionType(c)#>;
40+
<# } #>
41+
import com.microsoft.graph.options.Option;
42+
import com.microsoft.graph.http.BaseRequestBuilder;
43+
import com.microsoft.graph.core.IBaseClient;
44+
945
<#=CreateClassDef(TypeCollectionRequestBuilder(c), "BaseRequestBuilder", ITypeCollectionRequestBuilder(c))#>
1046

1147
/**
@@ -40,7 +76,6 @@
4076
<# } #>
4177

4278
<#
43-
var currentTypeProjection = c.AsOdcmProperty().Projection.Type.AsOdcmClass();
4479
if (currentTypeProjection != null) {
4580
foreach (var method in currentTypeProjection.MethodsAndOverloads()) {
4681

Templates/Java/requests_extensions/BaseEntityCollectionResponse.java.tt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.google.gson.annotations.SerializedName;
1212
import com.microsoft.graph.serializer.AdditionalDataManager;
1313
import com.microsoft.graph.serializer.IJsonBackedObject;
1414
import com.microsoft.graph.serializer.ISerializer;
15+
import com.microsoft.graph.models.extensions.<#=TypeName(c)#>;
1516

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

Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesPage.java.tt

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

9+
import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequestBuilder(c)#>;
10+
import com.microsoft.graph.requests.extensions.<#=ITypeCollectionWithReferencesPage(c)#>;
11+
import com.microsoft.graph.requests.extensions.<#=TypeCollectionResponse(c)#>;
12+
import com.microsoft.graph.models.extensions.<#=TypeName(c)#>;
913
import com.google.gson.JsonObject;
10-
import com.google.gson.annotations.*;
14+
import com.google.gson.annotations.SerializedName;
15+
import com.google.gson.annotations.Expose;
16+
import com.microsoft.graph.http.BaseCollectionPage;
1117

1218
<#=CreateClassDef(TypeCollectionWithReferencesPage(c), "BaseCollectionPage" + CollectionPageWithReferencesGeneric(c), ITypeCollectionWithReferencesPage(c))#>
1319

Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequest.java.tt

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

9+
import com.microsoft.graph.core.ClientException;
10+
import com.microsoft.graph.options.QueryOption;
11+
import com.microsoft.graph.options.Option;
12+
import com.microsoft.graph.core.IBaseClient;
13+
import com.microsoft.graph.http.BaseCollectionRequest;
14+
import com.microsoft.graph.concurrency.ICallback;
15+
import com.microsoft.graph.concurrency.IExecutors;
16+
917
<#=CreateClassDef(TypeCollectionWithReferencesRequest(c), "BaseCollectionRequest" + CollectionRequestGeneric(c), ITypeCollectionWithReferencesRequest(c))#>
1018

1119
/**

0 commit comments

Comments
 (0)