- removes duplicate imports

baywet · baywet · commit f38e1c848488 · 2020-08-27T10:35:39.000-04:00
- removes unused methods
- refactors imports inclusion
diff --git a/Templates/Java/models_extensions/BaseEntity.java.tt b/Templates/Java/models_extensions/BaseEntity.java.tt
@@ -12,7 +12,6 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
 import java.util.HashMap;
 import java.util.Map;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.serializer.AdditionalDataManager;
 
 <#=TypeHelperJava.CreateClassDef(c.TypeName(), c.BaseClassName(), "IJsonBackedObject")#>
 
diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionPage.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionPage.java.tt
@@ -6,10 +6,8 @@
 <#=writer.WriteHeader()#>
 <#=host.CreatePackageDefForBaseEntityCollectionPage()#>
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseCollectionPage;
-import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequestBuilder()#>;
 import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCollectionPage()#>;
 import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCollectionResponse()#>;
-import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
 
 <#=TypeHelperJava.CreateClassDef(c.TypeCollectionPage(), "BaseCollectionPage" + c.CollectionPageGeneric(), c.ITypeCollectionPage())#>
 <#
diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequest.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequest.java.tt
@@ -6,14 +6,12 @@
 <#=writer.WriteHeader()#>
 <#=host.CreatePackageDef()#>
 
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.ClientException;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.QueryOption;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseCollectionRequest;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.ReferenceRequestBody;
 import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.ICallback;
 
 <#=TypeHelperJava.CreateClassDef(c.TypeCollectionReferenceRequest(), "BaseCollectionRequest" + c.CollectionRequestGeneric(), c.ITypeCollectionReferenceRequest())#>
 
diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionRequest.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionRequest.java.tt
@@ -11,7 +11,6 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.QueryOption;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseCollectionRequest;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.IExecutors;
-import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
 import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionPage()#>;
 import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCollectionResponse()#>;
 import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequestBuilder()#>;
diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionRequestBuilder.java.tt
@@ -28,9 +28,6 @@ import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<
     }
 }
 #>
-<# if (c.ShouldIncludeCollectionTypeReference()) { #>
-import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TargetCollectionType()#>;
-<# } #>
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseRequestBuilder;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionResponse.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionResponse.java.tt
@@ -12,7 +12,6 @@ import com.google.gson.annotations.SerializedName;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.serializer.AdditionalDataManager;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.serializer.IJsonBackedObject;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.serializer.ISerializer;
-import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
 
 <#=TypeHelperJava.CreateClassDef(c.TypeCollectionResponse(), null, "IJsonBackedObject")#>
 
diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequest.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesRequest.java.tt
@@ -6,12 +6,10 @@
 <#=writer.WriteHeader()#>
 <#=host.CreatePackageDef()#>
 
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.ClientException;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.QueryOption;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseCollectionRequest;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.ICallback;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.IExecutors;
 
 <#=TypeHelperJava.CreateClassDef(c.TypeCollectionWithReferencesRequest(), "BaseCollectionRequest" + c.CollectionRequestGeneric(), c.ITypeCollectionWithReferencesRequest())#>
diff --git a/Templates/Java/requests_extensions/BaseEntityReferenceRequest.java.tt b/Templates/Java/requests_extensions/BaseEntityReferenceRequest.java.tt
@@ -6,14 +6,11 @@
 <#=writer.WriteHeader()#>
 <#=host.CreatePackageDef()#>
 
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.ClientException;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.QueryOption;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseRequest;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.HttpMethod;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
-import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.ICallback;
 
 <#=TypeHelperJava.CreateClassDef(c.TypeReferenceRequest(), "BaseRequest", c.ITypeReferenceRequest())#>
 
diff --git a/Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt
@@ -8,7 +8,6 @@
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseRequestBuilder;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
-import java.util.EnumSet;
 
 <#=TypeHelperJava.CreateClassDef(c.TypeRequestBuilder(), "BaseRequestBuilder", c.ITypeRequestBuilder())#>
 
diff --git a/Templates/Java/requests_extensions/BaseEntityWithReferenceRequest.java.tt b/Templates/Java/requests_extensions/BaseEntityWithReferenceRequest.java.tt
@@ -6,15 +6,12 @@
 <#=writer.WriteHeader()#>
 <#=host.CreatePackageDef()#>
 
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.ICallback;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.ClientException;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.QueryOption;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseRequest;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.HttpMethod;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.serializer.IJsonBackedObject;
-import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
 
 <#=TypeHelperJava.CreateClassDef(c.TypeWithReferencesRequest(), "BaseRequest", c.ITypeWithReferencesRequest())#>
 
diff --git a/Templates/Java/requests_extensions/BaseMethodCollectionPage.java.tt b/Templates/Java/requests_extensions/BaseMethodCollectionPage.java.tt
@@ -22,9 +22,6 @@
 import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequestBuilder()#>;
 import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCollectionPage()#>;
 import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCollectionResponse()#>;
-<# if (c.ShouldIncludeCollectionTypeReference()) { #>
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.models.<#=(c as OdcmMethod).OdcmMethodReturnNamespaceSection()#>.<#=(c as OdcmMethod).OdcmMethodReturnType()#>;
-<# } #>
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
diff --git a/Templates/Java/requests_extensions/BaseMethodCollectionRequest.java.tt b/Templates/Java/requests_extensions/BaseMethodCollectionRequest.java.tt
@@ -12,11 +12,6 @@ import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<
 <# if (c.AsOdcmMethod().IsAction() && c.AsOdcmMethod().Parameters.Any()) { #>
 import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TypeBody()#>;
 <# } #>
-<# if (c.ShouldIncludeCollectionTypeReference()) { #>
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.models.<#=(c as OdcmMethod).OdcmMethodReturnNamespaceSection()#>.<#=(c as OdcmMethod).OdcmMethodReturnType()#>;
-<# } #>
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.ICallback;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.ClientException;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.QueryOption;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
diff --git a/Templates/Java/requests_extensions/BaseMethodCollectionRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseMethodCollectionRequestBuilder.java.tt
@@ -9,9 +9,6 @@
 import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequestBuilder()#>;
 import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequest()#>;
 import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCollectionRequest()#>;
-<# if (c.ShouldIncludeCollectionTypeReference()) { #>
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.models.<#=(c as OdcmMethod).OdcmMethodReturnNamespaceSection()#>.<#=(c as OdcmMethod).OdcmMethodReturnType()#>;
-<# } #>
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.FunctionOption;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
diff --git a/Templates/Java/requests_extensions/BaseMethodCollectionResponse.java.tt b/Templates/Java/requests_extensions/BaseMethodCollectionResponse.java.tt
@@ -13,9 +13,6 @@ import com.google.gson.annotations.Expose;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.serializer.IJsonBackedObject;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.serializer.ISerializer;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.serializer.AdditionalDataManager;
-<# if (c.ShouldIncludeCollectionTypeReference()) { #>
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.models.<#=(c as OdcmMethod).OdcmMethodReturnNamespaceSection()#>.<#=(c as OdcmMethod).OdcmMethodReturnType()#>;
-<# } #>
 
 <#=TypeHelperJava.CreateClassDef(c.TypeCollectionResponse(), null, "IJsonBackedObject")#>
 
diff --git a/Templates/Java/requests_extensions/BaseMethodRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseMethodRequestBuilder.java.tt
@@ -9,7 +9,6 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.BaseActionRequestB
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.BaseFunctionRequestBuilder;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;
 import com.google.gson.JsonElement;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.<#=c.GetMethodRequestBuilderSuperClass() #>;
 
 <# bool isAction = !c.AsOdcmMethod().IsFunction; #>
 <#=TypeHelperJava.CreateClassDef(c.TypeRequestBuilder(), c.GetMethodRequestBuilderSuperClass(), c.ITypeRequestBuilder())#>
diff --git a/Templates/Java/requests_extensions/Client.java.tt b/Templates/Java/requests_extensions/Client.java.tt
@@ -5,7 +5,6 @@
 <#=writer.WriteHeader()#>
 <#=host.CreatePackageDef()#>
 
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.ClientException;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.authentication.*;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.logger.*;
 import com.google.gson.JsonObject;
diff --git a/Templates/Java/requests_extensions/IBaseEntityCollectionPage.java.tt b/Templates/Java/requests_extensions/IBaseEntityCollectionPage.java.tt
@@ -8,9 +8,6 @@
 
 import com.google.gson.JsonObject;
 import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequestBuilder()#>;
-<# if (c.ShouldIncludeCollectionTypeReference()) { #>
-import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TargetCollectionType()#>;
-<# } #>
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.IBaseCollectionPage;
 
 <#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionPage(), "IBaseCollectionPage" + c.CollectionPageGeneric())#>
diff --git a/Templates/Java/requests_extensions/IBaseEntityCollectionReferenceRequest.java.tt b/Templates/Java/requests_extensions/IBaseEntityCollectionReferenceRequest.java.tt
@@ -10,9 +10,6 @@ import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.IHttpRequest;
 import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
 
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.ClientException;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.ICallback;
-
 <#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionReferenceRequest())#>
 
     void post(final <#=c.TypeName()#> new<#=c.TypeName()#>, final ICallback<<#=c.TypeName()#>> callback);
diff --git a/Templates/Java/requests_extensions/IBaseEntityCollectionRequest.java.tt b/Templates/Java/requests_extensions/IBaseEntityCollectionRequest.java.tt
@@ -6,9 +6,6 @@
 <#=writer.WriteHeader()#>
 <#=host.CreatePackageDef()#>
 
-import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.ClientException;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.ICallback;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.IBaseCollectionPage;
 
 <#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionRequest())#>
diff --git a/Templates/Java/requests_extensions/IBaseEntityCollectionRequestBuilder.java.tt b/Templates/Java/requests_extensions/IBaseEntityCollectionRequestBuilder.java.tt
@@ -30,9 +30,6 @@ import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<
     }
 }
 #>
-<# if (c.ShouldIncludeCollectionTypeReference()) { #>
-import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TargetCollectionType()#>;
-<# } #>
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.IBaseCollectionPage;
 
diff --git a/Templates/Java/requests_extensions/IBaseEntityCollectionWithReferencesPage.java.tt b/Templates/Java/requests_extensions/IBaseEntityCollectionWithReferencesPage.java.tt
@@ -9,7 +9,6 @@
 import com.google.gson.JsonObject;
 import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.IBaseCollectionPage;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.ICallback;
 
 <#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionWithReferencesPage(), "IBaseCollectionPage" + c.CollectionPageWithReferencesGeneric())#>
 }
diff --git a/Templates/Java/requests_extensions/IBaseEntityCollectionWithReferencesRequest.java.tt b/Templates/Java/requests_extensions/IBaseEntityCollectionWithReferencesRequest.java.tt
@@ -6,9 +6,6 @@
 <#=writer.WriteHeader()#>
 <#=host.CreatePackageDef()#>
 
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.ClientException;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.ICallback;
-
 <#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionWithReferencesRequest())#>
 
     void get(final ICallback<<#=c.ITypeCollectionWithReferencesPage()#>> callback);
diff --git a/Templates/Java/requests_extensions/IBaseEntityReferenceRequest.java.tt b/Templates/Java/requests_extensions/IBaseEntityReferenceRequest.java.tt
@@ -7,8 +7,6 @@
 <#=host.CreatePackageDef()#>
 
 import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.ClientException;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.ICallback;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.IHttpRequest;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.serializer.IJsonBackedObject;
 
diff --git a/Templates/Java/requests_extensions/IBaseEntityRequestBuilder.java.tt b/Templates/Java/requests_extensions/IBaseEntityRequestBuilder.java.tt
@@ -5,9 +5,7 @@
 <#host.TemplateName = c.ITypeRequestBuilder();#>
 <#=writer.WriteHeader()#>
 <#=host.CreatePackageDef()#>
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.IRequestBuilder;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;
-import java.util.EnumSet;
 
 <#=TypeHelperJava.CreateInterfaceDef(c.ITypeRequestBuilder(), "IRequestBuilder")#>
     /**
diff --git a/Templates/Java/requests_extensions/IBaseEntityWithReferenceRequest.java.tt b/Templates/Java/requests_extensions/IBaseEntityWithReferenceRequest.java.tt
@@ -7,8 +7,6 @@
 <#=host.CreatePackageDef()#>
 
 import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.ClientException;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.ICallback;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.IHttpRequest;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.serializer.IJsonBackedObject;
 
diff --git a/Templates/Java/requests_extensions/IBaseMethodCollectionPage.java.tt b/Templates/Java/requests_extensions/IBaseMethodCollectionPage.java.tt
@@ -20,9 +20,6 @@
 #>
 
 import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.ITypeCollectionRequestBuilder()#>;
-<# if (c.ShouldIncludeCollectionTypeReference()) { #>
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.models.<#=(c as OdcmMethod).OdcmMethodReturnNamespaceSection()#>.<#=(c as OdcmMethod).OdcmMethodReturnType()#>;
-<# } #>
 import com.google.gson.JsonObject;
 import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.IBaseCollectionPage;
 
diff --git a/Templates/Java/requests_extensions/IBaseMethodCollectionRequest.java.tt b/Templates/Java/requests_extensions/IBaseMethodCollectionRequest.java.tt
@@ -10,9 +10,6 @@ import com.google.gson.JsonObject;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
 
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.ClientException;
-import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.concurrency.ICallback;
-
 <#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionRequest())#>
 
 <# if (c.AsOdcmMethod().IsAction()) { #>
diff --git a/src/GraphODataTemplateWriter/CodeHelpers/Java/TypeHelperJava.cs b/src/GraphODataTemplateWriter/CodeHelpers/Java/TypeHelperJava.cs
diff --git a/src/GraphODataTemplateWriter/Extensions/OdcmModelExtensions.cs b/src/GraphODataTemplateWriter/Extensions/OdcmModelExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,6 @@ import <#=host.CurrentNamespace()#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`#>`
`31`		`-<# if (c.ShouldIncludeCollectionTypeReference()) { #>`
`32`		`-import <#=host.CurrentNamespace()#>.<#=c.GetPackagePrefix()#>.<#=c.TargetCollectionType()#>;`
`33`		`-<# } #>`
`34`	`31`	`import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.options.Option;`
`35`	`32`	`import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.http.BaseRequestBuilder;`
`36`	`33`	`import <#=host.CurrentModel.GetNamespace().AddPrefix()#>.core.IBaseClient;`