Skip to content

Commit 2c04586

Browse files
authored
Merge pull request #290 from microsoftgraph/feature/java-request-interfaces-inheritance
feature/java request interfaces inheritance
2 parents ae3d8b4 + 6a07d7c commit 2c04586

19 files changed

+42
-19
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()) {

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/ICallCollectionRequest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313
import java.util.EnumSet;
1414

1515
import com.microsoft.graph.http.IBaseCollectionPage;
16+
import com.microsoft.graph.http.IHttpRequest;
1617

1718
// **NOTE** This file was generated by a tool and any changes will be overwritten.
1819

1920
/**
2021
* The interface for the Call Collection Request.
2122
*/
22-
public interface ICallCollectionRequest {
23+
public interface ICallCollectionRequest extends IHttpRequest {
2324

2425
void get(final ICallback<ICallCollectionPage> callback);
2526

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType2CollectionRequest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313
import java.util.EnumSet;
1414

1515
import com.microsoft.graph.http.IBaseCollectionPage;
16+
import com.microsoft.graph.http.IHttpRequest;
1617

1718
// **NOTE** This file was generated by a tool and any changes will be overwritten.
1819

1920
/**
2021
* The interface for the Entity Type2Collection Request.
2122
*/
22-
public interface IEntityType2CollectionRequest {
23+
public interface IEntityType2CollectionRequest extends IHttpRequest {
2324

2425
void get(final ICallback<IEntityType2CollectionPage> callback);
2526

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3CollectionRequest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414
import java.util.EnumSet;
1515

1616
import com.microsoft.graph.http.IBaseCollectionPage;
17+
import com.microsoft.graph.http.IHttpRequest;
1718

1819
// **NOTE** This file was generated by a tool and any changes will be overwritten.
1920

2021
/**
2122
* The interface for the Entity Type3Collection Request.
2223
*/
23-
public interface IEntityType3CollectionRequest {
24+
public interface IEntityType3CollectionRequest extends IHttpRequest {
2425

2526
void get(final ICallback<IEntityType3CollectionPage> callback);
2627

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3CollectionWithReferencesRequest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@
1414
import java.util.Arrays;
1515
import java.util.EnumSet;
1616

17+
import com.microsoft.graph.http.IHttpRequest;
18+
1719
// **NOTE** This file was generated by a tool and any changes will be overwritten.
1820

1921
/**
2022
* The interface for the Entity Type3Collection With References Request.
2123
*/
22-
public interface IEntityType3CollectionWithReferencesRequest {
24+
public interface IEntityType3CollectionWithReferencesRequest extends IHttpRequest {
2325

2426
void get(final ICallback<IEntityType3CollectionWithReferencesPage> callback);
2527

test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/IEntityType3ForwardRequest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
import com.microsoft.graph.http.BaseRequest;
1111
import com.microsoft.graph.core.ClientException;
1212
import com.microsoft.graph.http.BaseCollectionRequest;
13+
import com.microsoft.graph.http.IHttpRequest;
1314

1415
// **NOTE** This file was generated by a tool and any changes will be overwritten.
1516

1617
/**
1718
* The interface for the Entity Type3Forward Request.
1819
*/
19-
public interface IEntityType3ForwardRequest {
20+
public interface IEntityType3ForwardRequest extends IHttpRequest {
2021

2122
void post(final ICallback<Void> callback);
2223

0 commit comments

Comments
 (0)