Skip to content

Commit 1f3337a

Browse files
authored
Merge pull request #492 from microsoftgraph/bugfix/response-headers-page-collection
bugfix/response-headers-page-collection
2 parents 760e81f + 5dd4feb commit 1f3337a

File tree

276 files changed

+290
-273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

276 files changed

+290
-273
lines changed

src/main/java/com/microsoft/graph/callrecords/requests/extensions/CallRecordCollectionPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ public class CallRecordCollectionPage extends BaseCollectionPage<CallRecord, ICa
2323
* @param builder the request builder for the next collection page
2424
*/
2525
public CallRecordCollectionPage(final CallRecordCollectionResponse response, final ICallRecordCollectionRequestBuilder builder) {
26-
super(response.value, builder);
26+
super(response.value, builder, response.additionalDataManager());
2727
}
2828
}

src/main/java/com/microsoft/graph/callrecords/requests/extensions/SegmentCollectionPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ public class SegmentCollectionPage extends BaseCollectionPage<Segment, ISegmentC
2323
* @param builder the request builder for the next collection page
2424
*/
2525
public SegmentCollectionPage(final SegmentCollectionResponse response, final ISegmentCollectionRequestBuilder builder) {
26-
super(response.value, builder);
26+
super(response.value, builder, response.additionalDataManager());
2727
}
2828
}

src/main/java/com/microsoft/graph/callrecords/requests/extensions/SessionCollectionPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ public class SessionCollectionPage extends BaseCollectionPage<Session, ISessionC
2323
* @param builder the request builder for the next collection page
2424
*/
2525
public SessionCollectionPage(final SessionCollectionResponse response, final ISessionCollectionRequestBuilder builder) {
26-
super(response.value, builder);
26+
super(response.value, builder, response.additionalDataManager());
2727
}
2828
}

src/main/java/com/microsoft/graph/http/BaseCollectionPage.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,18 @@ public BaseCollectionPage(final List<T1> pageContents, final T2 nextRequestBuild
7272
requestBuilder = nextRequestBuilder;
7373
}
7474

75+
/**
76+
* Creates the collection page
77+
*
78+
* @param pageContents the contents of this page
79+
* @param nextRequestBuilder the request builder for the next page
80+
* @param responseAdditionalData the additional data returned by the response
81+
*/
82+
public BaseCollectionPage(final List<T1> pageContents, final T2 nextRequestBuilder, final AdditionalDataManager responseAdditionalData) {
83+
this(pageContents, nextRequestBuilder);
84+
this.additionalDataManager().putAll(responseAdditionalData);
85+
}
86+
7587
/**
7688
* Gets the next page request builder
7789
*

src/main/java/com/microsoft/graph/requests/extensions/ActivityBasedTimeoutPolicyCollectionPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ public class ActivityBasedTimeoutPolicyCollectionPage extends BaseCollectionPage
2323
* @param builder the request builder for the next collection page
2424
*/
2525
public ActivityBasedTimeoutPolicyCollectionPage(final ActivityBasedTimeoutPolicyCollectionResponse response, final IActivityBasedTimeoutPolicyCollectionRequestBuilder builder) {
26-
super(response.value, builder);
26+
super(response.value, builder, response.additionalDataManager());
2727
}
2828
}

src/main/java/com/microsoft/graph/requests/extensions/ActivityHistoryItemCollectionPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ public class ActivityHistoryItemCollectionPage extends BaseCollectionPage<Activi
2323
* @param builder the request builder for the next collection page
2424
*/
2525
public ActivityHistoryItemCollectionPage(final ActivityHistoryItemCollectionResponse response, final IActivityHistoryItemCollectionRequestBuilder builder) {
26-
super(response.value, builder);
26+
super(response.value, builder, response.additionalDataManager());
2727
}
2828
}

src/main/java/com/microsoft/graph/requests/extensions/AdministrativeUnitCollectionPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ public class AdministrativeUnitCollectionPage extends BaseCollectionPage<Adminis
2323
* @param builder the request builder for the next collection page
2424
*/
2525
public AdministrativeUnitCollectionPage(final AdministrativeUnitCollectionResponse response, final IAdministrativeUnitCollectionRequestBuilder builder) {
26-
super(response.value, builder);
26+
super(response.value, builder, response.additionalDataManager());
2727
}
2828
}

src/main/java/com/microsoft/graph/requests/extensions/AdministrativeUnitDeltaCollectionPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class AdministrativeUnitDeltaCollectionPage extends BaseCollectionPage<Ad
4040
* @param builder The request builder for the next collection page
4141
*/
4242
public AdministrativeUnitDeltaCollectionPage(final AdministrativeUnitDeltaCollectionResponse response, final IAdministrativeUnitDeltaCollectionRequestBuilder builder) {
43-
super(response.value, builder);
43+
super(response.value, builder, response.additionalDataManager());
4444

4545
if (response.getRawObject().get("@odata.deltaLink") != null) {
4646
deltaLink = response.getRawObject().get("@odata.deltaLink").getAsString();

src/main/java/com/microsoft/graph/requests/extensions/AlertCollectionPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ public class AlertCollectionPage extends BaseCollectionPage<Alert, IAlertCollect
2323
* @param builder the request builder for the next collection page
2424
*/
2525
public AlertCollectionPage(final AlertCollectionResponse response, final IAlertCollectionRequestBuilder builder) {
26-
super(response.value, builder);
26+
super(response.value, builder, response.additionalDataManager());
2727
}
2828
}

src/main/java/com/microsoft/graph/requests/extensions/AndroidManagedAppProtectionCollectionPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ public class AndroidManagedAppProtectionCollectionPage extends BaseCollectionPag
2323
* @param builder the request builder for the next collection page
2424
*/
2525
public AndroidManagedAppProtectionCollectionPage(final AndroidManagedAppProtectionCollectionResponse response, final IAndroidManagedAppProtectionCollectionRequestBuilder builder) {
26-
super(response.value, builder);
26+
super(response.value, builder, response.additionalDataManager());
2727
}
2828
}

0 commit comments

Comments
 (0)