Skip to content

Commit 6a07d7c

Browse files
committed
- makes request interfaces inherit from IHttpRequest to avoid requiring casting from consummers
1 parent 87d278c commit 6a07d7c

File tree

5 files changed

+13
-5
lines changed

5 files changed

+13
-5
lines changed

Templates/Java/requests_extensions/IBaseEntityCollectionRequest.java.tt

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

99
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
1010
import <#=importNamespace#>.http.IBaseCollectionPage;
11+
import <#=importNamespace#>.http.IHttpRequest;
1112

12-
<#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionRequest())#>
13+
<#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionRequest(), "IHttpRequest")#>
1314

1415
void get(final ICallback<<#=c.ITypeCollectionPage()#>> callback);
1516

Templates/Java/requests_extensions/IBaseEntityCollectionWithReferencesRequest.java.tt

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

9-
<#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionWithReferencesRequest())#>
9+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
10+
import <#=importNamespace#>.http.IHttpRequest;
11+
12+
<#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionWithReferencesRequest(), "IHttpRequest")#>
1013

1114
void get(final ICallback<<#=c.ITypeCollectionWithReferencesPage()#>> callback);
1215

Templates/Java/requests_extensions/IBaseMethodBodyRequest.java.tt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ import <#=importNamespace#>.http.BaseCollectionRequest;
2828
import <#=importNamespace#>.http.BaseRequest;
2929
import <#=importNamespace#>.core.ClientException;
3030
import <#=importNamespace#>.http.BaseCollectionRequest;
31+
import <#=importNamespace#>.http.IHttpRequest;
3132

32-
<#=TypeHelperJava.CreateInterfaceDef(iBaseTypeRequest)#>
33+
<#=TypeHelperJava.CreateInterfaceDef(iBaseTypeRequest, "IHttpRequest")#>
3334

3435
void post(final ICallback<<#=c.ReturnType()#>> callback);
3536

Templates/Java/requests_extensions/IBaseMethodCollectionRequest.java.tt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
<#host.TemplateName = c.ITypeCollectionRequest();#>
66
<#=writer.WriteHeader()#>
77
<#=host.CreatePackageDef()#>
8+
<# var importNamespace = host.CurrentModel.GetNamespace().AddPrefix(); #>
9+
import <#=importNamespace#>.http.IHttpRequest;
810

911
import com.google.gson.JsonObject;
1012
import com.google.gson.annotations.SerializedName;
1113
import com.google.gson.annotations.Expose;
1214

13-
<#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionRequest())#>
15+
<#=TypeHelperJava.CreateInterfaceDef(c.ITypeCollectionRequest(), "IHttpRequest")#>
1416

1517
<# if (c.AsOdcmMethod().IsAction()) { #>
1618
void post(final ICallback<<#=c.ITypeCollectionPage()#>> callback);

Templates/Java/requests_extensions/IBaseMethodRequest.java.tt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ import <#=importNamespace#>.core.ClientException;
1212
import <#=importNamespace#>.core.IBaseClient;
1313
import <#=importNamespace#>.http.BaseRequest;
1414
import <#=importNamespace#>.http.HttpMethod;
15+
import <#=importNamespace#>.http.IHttpRequest;
1516

16-
<#=TypeHelperJava.CreateInterfaceDef(c.ITypeRequest())#>
17+
<#=TypeHelperJava.CreateInterfaceDef(c.ITypeRequest(), "IHttpRequest")#>
1718

1819
<#
1920
if (c.AsOdcmMethod().IsAction()) {

0 commit comments

Comments
 (0)