- fixes an issue where a lot of generated java code would be missing …

…imports
microsoftgraph · Aug 25, 2020 · 8dfd3b2 · 8dfd3b2
1 parent 0b005bc
commit 8dfd3b2
Show file tree

Hide file tree

Showing 34 changed files with 254 additions and 7 deletions.
diff --git a/Templates/Java/models_extensions/BaseEntity.java.tt b/Templates/Java/models_extensions/BaseEntity.java.tt
@@ -8,9 +8,11 @@
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonElement;
-import com.google.gson.annotations.*;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
 import java.util.HashMap;
 import java.util.Map;
+import com.microsoft.graph.serializer.AdditionalDataManager;
 
 <#=CreateClassDef(TypeName(c), BaseClassName(c), "IJsonBackedObject")#>
 

diff --git a/Templates/Java/models_extensions/BaseMethodBody.java.tt b/Templates/Java/models_extensions/BaseMethodBody.java.tt
@@ -5,7 +5,14 @@
 <#host.TemplateName = TypeBody(c);#>
 <#=writer.WriteHeader()#>
 <#=CreatePackageDefinition(host)#>
-import com.microsoft.graph.models.generated.*;
+<#
+var parameterList = MethodParametersImports(c.AsOdcmMethod());
+if (parameterList != "") {
+#>
+<#=parameterList#>
+<#
+}
+#>
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.JsonObject;

diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionPage.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionPage.java.tt
@@ -6,6 +6,10 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDefForBaseEntityCollectionPage(host)#>
 import com.microsoft.graph.http.BaseCollectionPage;
+import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequestBuilder(c)#>;
+import com.microsoft.graph.requests.extensions.<#=TypeCollectionPage(c)#>;
+import com.microsoft.graph.requests.extensions.<#=TypeCollectionResponse(c)#>;
+import com.microsoft.graph.models.extensions.<#=TypeName(c)#>;
 
 <#=CreateClassDef(TypeCollectionPage(c), "BaseCollectionPage" + CollectionPageGeneric(c), ITypeCollectionPage(c))#>
 <#

diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequest.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequest.java.tt
@@ -6,6 +6,15 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.options.QueryOption;
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.BaseCollectionRequest;
+import com.microsoft.graph.http.ReferenceRequestBody;
+import com.microsoft.graph.models.extensions.<#=TypeName(c)#>;
+import com.microsoft.graph.concurrency.ICallback;
+
 <#=CreateClassDef(TypeCollectionReferenceRequest(c), "BaseCollectionRequest" + CollectionRequestGeneric(c), ITypeCollectionReferenceRequest(c))#>
 
     /**

diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequestBuilder.java.tt
@@ -6,6 +6,10 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.http.BaseRequestBuilder;
+import com.microsoft.graph.core.IBaseClient;
+
 <#=CreateClassDef(TypeCollectionReferenceRequestBuilder(c), "BaseRequestBuilder", ITypeCollectionReferenceRequestBuilder(c))#>
 
     /**

diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionRequest.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionRequest.java.tt
@@ -6,6 +6,20 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.options.QueryOption;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.BaseCollectionRequest;
+import com.microsoft.graph.concurrency.ICallback;
+import com.microsoft.graph.concurrency.IExecutors;
+import com.microsoft.graph.models.extensions.<#=TypeName(c)#>;
+import com.microsoft.graph.requests.extensions.<#=ITypeCollectionPage(c)#>;
+import com.microsoft.graph.requests.extensions.<#=TypeCollectionResponse(c)#>;
+import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequestBuilder(c)#>;
+import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequest(c)#>;
+import com.microsoft.graph.requests.extensions.<#=TypeCollectionPage(c)#>;
+
 <#=CreateClassDef(TypeCollectionRequest(c), "BaseCollectionRequest" + CollectionRequestGeneric(c), ITypeCollectionRequest(c))#>
 
     /**

diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt
@@ -6,6 +6,42 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequestBuilder(c)#>;
+import com.microsoft.graph.requests.extensions.<#=ITypeRequestBuilder(c)#>;
+import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequest(c)#>;
+<#
+var currentTypeProjection = c.AsOdcmProperty().Projection.Type.AsOdcmClass();
+if (currentTypeProjection != null) {
+    foreach (var method in currentTypeProjection.MethodsAndOverloads()) {
+        if (!method.IsBoundToCollection) {
+            continue;
+        }
+
+        var parameterList = MethodParametersImports(method);
+if (parameterList != "") {
+#>
+<#=parameterList#>
+<#
+}
+        if (method.IsCollection) {
+#>
+import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequestBuilder(method)#>;
+<#
+        } else {
+#>
+import com.microsoft.graph.requests.extensions.<#=ITypeRequestBuilder(method)#>;
+<#
+        }
+    }
+}
+#>
+<# if (ShouldIncludeCollectionTypeReference(c)) { #>
+import com.microsoft.graph.models.extensions.<#=TargetCollectionType(c)#>;
+<# } #>
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.http.BaseRequestBuilder;
+import com.microsoft.graph.core.IBaseClient;
+
 <#=CreateClassDef(TypeCollectionRequestBuilder(c), "BaseRequestBuilder", ITypeCollectionRequestBuilder(c))#>
 
     /**
@@ -40,7 +76,6 @@
 <# } #>
 
 <#
-var currentTypeProjection = c.AsOdcmProperty().Projection.Type.AsOdcmClass();
 if (currentTypeProjection != null) {
     foreach (var method in currentTypeProjection.MethodsAndOverloads()) {
 

diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionResponse.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionResponse.java.tt
@@ -12,6 +12,7 @@ import com.google.gson.annotations.SerializedName;
 import com.microsoft.graph.serializer.AdditionalDataManager;
 import com.microsoft.graph.serializer.IJsonBackedObject;
 import com.microsoft.graph.serializer.ISerializer;
+import com.microsoft.graph.models.extensions.<#=TypeName(c)#>;
 
 <#=CreateClassDef(TypeCollectionResponse(c), null, "IJsonBackedObject")#>
 

diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesPage.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesPage.java.tt
@@ -6,8 +6,14 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequestBuilder(c)#>;
+import com.microsoft.graph.requests.extensions.<#=ITypeCollectionWithReferencesPage(c)#>;
+import com.microsoft.graph.requests.extensions.<#=TypeCollectionResponse(c)#>;
+import com.microsoft.graph.models.extensions.<#=TypeName(c)#>;
 import com.google.gson.JsonObject;
-import com.google.gson.annotations.*;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
+import com.microsoft.graph.http.BaseCollectionPage;
 
 <#=CreateClassDef(TypeCollectionWithReferencesPage(c), "BaseCollectionPage" + CollectionPageWithReferencesGeneric(c), ITypeCollectionWithReferencesPage(c))#>
 

diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequest.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequest.java.tt
@@ -6,6 +6,14 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.options.QueryOption;
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.BaseCollectionRequest;
+import com.microsoft.graph.concurrency.ICallback;
+import com.microsoft.graph.concurrency.IExecutors;
+
 <#=CreateClassDef(TypeCollectionWithReferencesRequest(c), "BaseCollectionRequest" + CollectionRequestGeneric(c), ITypeCollectionWithReferencesRequest(c))#>
 
     /**

diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequestBuilder.java.tt
@@ -6,6 +6,10 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.http.BaseRequestBuilder;
+import com.microsoft.graph.core.IBaseClient;
+
 <#=CreateClassDef(TypeCollectionWithReferencesRequestBuilder(c), "BaseRequestBuilder", ITypeCollectionWithReferencesRequestBuilder(c))#>
 
     /**

diff --git a/Templates/Java/requests_extensions/BaseEntityReferenceRequest.java.tt b/Templates/Java/requests_extensions/BaseEntityReferenceRequest.java.tt
@@ -6,6 +6,15 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.options.QueryOption;
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.http.BaseRequest;
+import com.microsoft.graph.http.HttpMethod;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.models.extensions.<#=TypeName(c)#>;
+import com.microsoft.graph.concurrency.ICallback;
+
 <#=CreateClassDef(TypeReferenceRequest(c), "BaseRequest", ITypeReferenceRequest(c))#>
 
     /**

diff --git a/Templates/Java/requests_extensions/BaseEntityReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityReferenceRequestBuilder.java.tt
@@ -7,6 +7,10 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.http.BaseRequestBuilder;
+import com.microsoft.graph.core.IBaseClient;
+
 <#=CreateClassDef(TypeReferenceRequestBuilder(c), "BaseRequestBuilder", ITypeReferenceRequestBuilder(c))#>
 
     /**

diff --git a/Templates/Java/requests_extensions/BaseEntityWithReferenceRequest.java.tt b/Templates/Java/requests_extensions/BaseEntityWithReferenceRequest.java.tt
@@ -6,6 +6,16 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.concurrency.ICallback;
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.options.QueryOption;
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.http.BaseRequest;
+import com.microsoft.graph.http.HttpMethod;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.serializer.IJsonBackedObject;
+import com.microsoft.graph.models.extensions.<#=TypeName(c)#>;
+
 <#=CreateClassDef(TypeWithReferencesRequest(c), "BaseRequest", ITypeWithReferencesRequest(c))#>
 
     /**

diff --git a/Templates/Java/requests_extensions/BaseEntityWithReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityWithReferenceRequestBuilder.java.tt
@@ -6,6 +6,10 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.http.BaseRequestBuilder;
+import com.microsoft.graph.core.IBaseClient;
+
 <#=CreateClassDef(TypeWithReferencesRequestBuilder(c), "BaseRequestBuilder", ITypeWithReferencesRequestBuilder(c))#>
 
     /**

diff --git a/Templates/Java/requests_extensions/BaseMethodBodyRequest.java.tt b/Templates/Java/requests_extensions/BaseMethodBodyRequest.java.tt
@@ -22,6 +22,9 @@
 <#host.TemplateName = baseTypeRequest;#>
 <#=writer.WriteHeader()#>
 <#=CreatePackageDefForBaseMethodBodyRequest(host)#>
+import com.microsoft.graph.http.BaseCollectionRequest;
+import com.microsoft.graph.http.BaseRequest;
+import com.microsoft.graph.http.HttpMethod;
 import com.microsoft.graph.concurrency.ICallback;
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;

diff --git a/Templates/Java/requests_extensions/BaseMethodCollectionRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseMethodCollectionRequestBuilder.java.tt
@@ -5,6 +5,27 @@
 <#host.TemplateName = TypeCollectionRequestBuilder(c);#>
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
+
+import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequestBuilder(c)#>;
+import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequest(c)#>;
+import com.microsoft.graph.requests.extensions.<#=TypeCollectionRequest(c)#>;
+<# if (ShouldIncludeCollectionTypeReference(c)) { #>
+import com.microsoft.graph.models.<#=OdcmMethodReturnNamespaceSection(c as OdcmMethod)#>.<#=OdcmMethodReturnType(c as OdcmMethod)#>;
+<# } #>
+<# foreach (var method in c.AsOdcmMethod().WithOverloads()) {
+    var parameterList = MethodParametersImports(method);
+    if (parameterList != "") {
+#>
+<#=parameterList#>
+<#
+    }
+} 
+#>
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.options.FunctionOption;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.core.<#=RequestBuilderSuperClass(c) #>;
+
 <# bool isAction = !c.AsOdcmMethod().IsFunction; #>
 <#=CreateClassDef(TypeCollectionRequestBuilder(c), RequestBuilderSuperClass(c), ITypeCollectionRequestBuilder(c))#>
 

diff --git a/Templates/Java/requests_extensions/BaseMethodCollectionResponse.java.tt b/Templates/Java/requests_extensions/BaseMethodCollectionResponse.java.tt
@@ -8,7 +8,14 @@
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import com.google.gson.annotations.*;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
+import com.microsoft.graph.serializer.IJsonBackedObject;
+import com.microsoft.graph.serializer.ISerializer;
+import com.microsoft.graph.serializer.AdditionalDataManager;
+<# if (ShouldIncludeCollectionTypeReference(c)) { #>
+import com.microsoft.graph.models.<#=OdcmMethodReturnNamespaceSection(c as OdcmMethod)#>.<#=OdcmMethodReturnType(c as OdcmMethod)#>;
+<# } #>
 
 <#=CreateClassDef(TypeCollectionResponse(c), null, "IJsonBackedObject")#>
 

diff --git a/Templates/Java/requests_extensions/IBaseEntityCollectionPage.java.tt b/Templates/Java/requests_extensions/IBaseEntityCollectionPage.java.tt
@@ -7,6 +7,11 @@
 <#=CreatePackageDef(host)#>
 
 import com.google.gson.JsonObject;
+import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequestBuilder(c)#>;
+<# if (ShouldIncludeCollectionTypeReference(c)) { #>
+import com.microsoft.graph.models.extensions.<#=TargetCollectionType(c)#>;
+<# } #>
+import com.microsoft.graph.http.IBaseCollectionPage;
 
 <#=CreateInterfaceDef(ITypeCollectionPage(c), "IBaseCollectionPage" + CollectionPageGeneric(c))#>
 }
diff --git a/Templates/Java/requests_extensions/IBaseEntityCollectionReferenceRequest.java.tt b/Templates/Java/requests_extensions/IBaseEntityCollectionReferenceRequest.java.tt
@@ -6,6 +6,13 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.http.IHttpRequest;
+import com.microsoft.graph.models.extensions.<#=TypeName(c)#>;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.concurrency.ICallback;
+
 <#=CreateInterfaceDef(ITypeCollectionReferenceRequest(c))#>
 
     void post(final <#=TypeName(c)#> new<#=TypeName(c)#>, final ICallback<<#=TypeName(c)#>> callback);

diff --git a/Templates/Java/requests_extensions/IBaseEntityCollectionReferenceRequestBuilder.java.tt b/Templates/Java/requests_extensions/IBaseEntityCollectionReferenceRequestBuilder.java.tt
@@ -9,6 +9,8 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.options.Option;
+
 <#=CreateInterfaceDef(ITypeCollectionReferenceRequestBuilder(c), "IRequestBuilder")#>
 
     <#=ITypeCollectionReferenceRequest(c)#> buildRequest();

diff --git a/Templates/Java/requests_extensions/IBaseEntityCollectionRequest.java.tt b/Templates/Java/requests_extensions/IBaseEntityCollectionRequest.java.tt
@@ -6,6 +6,11 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.models.extensions.<#=TypeName(c)#>;
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.concurrency.ICallback;
+import com.microsoft.graph.http.IBaseCollectionPage;
+
 <#=CreateInterfaceDef(ITypeCollectionRequest(c))#>
 
     void get(final ICallback<<#=ITypeCollectionPage(c)#>> callback);

diff --git a/Templates/Java/requests_extensions/IBaseEntityCollectionRequestBuilder.java.tt b/Templates/Java/requests_extensions/IBaseEntityCollectionRequestBuilder.java.tt
@@ -9,6 +9,41 @@
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
 
+import com.microsoft.graph.requests.extensions.<#=ITypeRequestBuilder(c)#>;
+import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequest(c)#>;
+<#
+var currentTypeProjection = c.AsOdcmProperty().Projection.Type.AsOdcmClass();
+if (currentTypeProjection != null) {
+    foreach (var method in currentTypeProjection.MethodsAndOverloads()) {
+        if (!method.IsBoundToCollection) {
+            continue;
+        }
+
+        var parameterList = MethodParametersImports(method);
+        if (parameterList != "") {
+#>
+<#=parameterList#>
+<#
+}
+        if (method.IsCollection) {
+#>
+import com.microsoft.graph.requests.extensions.<#=ITypeCollectionRequestBuilder(method)#>;
+<#
+        } else {
+#>
+import com.microsoft.graph.requests.extensions.<#=ITypeRequestBuilder(method)#>;
+<#
+        }
+    }
+}
+#>
+<# if (ShouldIncludeCollectionTypeReference(c)) { #>
+import com.microsoft.graph.models.extensions.<#=TargetCollectionType(c)#>;
+<# } #>
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.http.IBaseCollectionPage;
+import com.microsoft.graph.concurrency.ICallback;
+
 <#=CreateInterfaceDef(ITypeCollectionRequestBuilder(c), "IRequestBuilder")#>
 
     <#=ITypeCollectionRequest(c)#> buildRequest();
@@ -18,7 +53,6 @@
     <#=ITypeRequestBuilder(c)#> byId(final String id);
 
 <#
-var currentTypeProjection = c.AsOdcmProperty().Projection.Type.AsOdcmClass();
 if (currentTypeProjection != null)
 {
     foreach (var method in currentTypeProjection.AsOdcmClass().MethodsAndOverloads()) {