From f444cafbe9e6f3dad1515ae837e118a5428341e4 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 22 Sep 2020 15:03:37 -0400
Subject: [PATCH 1/2] - updates unit test files

---
 .../microsoft/graph/requests/extensions/CallCollectionPage.java | 2 +-
 .../graph/requests/extensions/EntityType2CollectionPage.java    | 2 +-
 .../graph/requests/extensions/EntityType3CollectionPage.java    | 2 +-
 .../extensions/EntityType3CollectionWithReferencesPage.java     | 2 +-
 .../graph/requests/extensions/TestTypeQueryCollectionPage.java  | 2 +-
 .../graph/requests/extensions/TimeOffCollectionPage.java        | 2 +-
 .../graph/requests/extensions/TimeOffRequestCollectionPage.java | 2 +-
 .../requests/extensions/CallRecordCollectionPage.java           | 2 +-
 .../callrecords/requests/extensions/SegmentCollectionPage.java  | 2 +-
 .../requests/extensions/SegmentTestActionCollectionPage.java    | 2 +-
 .../callrecords/requests/extensions/SessionCollectionPage.java  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionPage.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionPage.java
index 428401b5c..3ffc128e3 100644
--- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionPage.java
+++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionPage.java
@@ -23,6 +23,6 @@ public class CallCollectionPage extends BaseCollectionPage<Call, ICallCollection
      * @param builder  the request builder for the next collection page
      */
     public CallCollectionPage(final CallCollectionResponse response, final ICallCollectionRequestBuilder builder) {
-        super(response.value, builder);
+        super(response.value, builder, response.additionalDataManager());
     }
 }
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionPage.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionPage.java
index e0fb32e95..9fe97f17a 100644
--- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionPage.java
+++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionPage.java
@@ -23,6 +23,6 @@ public class EntityType2CollectionPage extends BaseCollectionPage<EntityType2, I
      * @param builder  the request builder for the next collection page
      */
     public EntityType2CollectionPage(final EntityType2CollectionResponse response, final IEntityType2CollectionRequestBuilder builder) {
-        super(response.value, builder);
+        super(response.value, builder, response.additionalDataManager());
     }
 }
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionPage.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionPage.java
index 6133967f2..291399e58 100644
--- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionPage.java
+++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionPage.java
@@ -23,6 +23,6 @@ public class EntityType3CollectionPage extends BaseCollectionPage<EntityType3, I
      * @param builder  the request builder for the next collection page
      */
     public EntityType3CollectionPage(final EntityType3CollectionResponse response, final IEntityType3CollectionRequestBuilder builder) {
-        super(response.value, builder);
+        super(response.value, builder, response.additionalDataManager());
     }
 }
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionWithReferencesPage.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionWithReferencesPage.java
index 8b93629ad..2864b3bae 100644
--- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionWithReferencesPage.java
+++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionWithReferencesPage.java
@@ -37,6 +37,6 @@ public class EntityType3CollectionWithReferencesPage extends BaseCollectionPage<
      * @param builder  the request builder for the next collection page
      */
     public EntityType3CollectionWithReferencesPage(final EntityType3CollectionResponse response, final IEntityType3CollectionWithReferencesRequestBuilder builder) {
-        super(response.value, builder);
+        super(response.value, builder, response.additionalDataManager());
     }
 }
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeQueryCollectionPage.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeQueryCollectionPage.java
index 384a4d846..247f879e8 100644
--- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeQueryCollectionPage.java
+++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TestTypeQueryCollectionPage.java
@@ -35,6 +35,6 @@ public class TestTypeQueryCollectionPage extends BaseCollectionPage<ResponseObje
      * @param builder The request builder for the next collection page
      */
     public TestTypeQueryCollectionPage(final TestTypeQueryCollectionResponse response, final ITestTypeQueryCollectionRequestBuilder builder) {
-       super(response.value, builder);
+       super(response.value, builder, response.additionalDataManager());
     }
 }
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionPage.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionPage.java
index 93883c816..a3fdbe26e 100644
--- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionPage.java
+++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionPage.java
@@ -23,6 +23,6 @@ public class TimeOffCollectionPage extends BaseCollectionPage<TimeOff, ITimeOffC
      * @param builder  the request builder for the next collection page
      */
     public TimeOffCollectionPage(final TimeOffCollectionResponse response, final ITimeOffCollectionRequestBuilder builder) {
-        super(response.value, builder);
+        super(response.value, builder, response.additionalDataManager());
     }
 }
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionPage.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionPage.java
index d767977c6..3321874d6 100644
--- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionPage.java
+++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionPage.java
@@ -23,6 +23,6 @@ public class TimeOffRequestCollectionPage extends BaseCollectionPage<TimeOffRequ
      * @param builder  the request builder for the next collection page
      */
     public TimeOffRequestCollectionPage(final TimeOffRequestCollectionResponse response, final ITimeOffRequestCollectionRequestBuilder builder) {
-        super(response.value, builder);
+        super(response.value, builder, response.additionalDataManager());
     }
 }
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionPage.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionPage.java
index f08f2d653..8e8da9e75 100644
--- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionPage.java
+++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionPage.java
@@ -23,6 +23,6 @@ public class CallRecordCollectionPage extends BaseCollectionPage<CallRecord, ICa
      * @param builder  the request builder for the next collection page
      */
     public CallRecordCollectionPage(final CallRecordCollectionResponse response, final ICallRecordCollectionRequestBuilder builder) {
-        super(response.value, builder);
+        super(response.value, builder, response.additionalDataManager());
     }
 }
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionPage.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionPage.java
index 055d18428..2b9ec6ef3 100644
--- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionPage.java
+++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionPage.java
@@ -23,6 +23,6 @@ public class SegmentCollectionPage extends BaseCollectionPage<Segment, ISegmentC
      * @param builder  the request builder for the next collection page
      */
     public SegmentCollectionPage(final SegmentCollectionResponse response, final ISegmentCollectionRequestBuilder builder) {
-        super(response.value, builder);
+        super(response.value, builder, response.additionalDataManager());
     }
 }
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentTestActionCollectionPage.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentTestActionCollectionPage.java
index 7583bcf1c..85feee43b 100644
--- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentTestActionCollectionPage.java
+++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentTestActionCollectionPage.java
@@ -35,6 +35,6 @@ public class SegmentTestActionCollectionPage extends BaseCollectionPage<Session,
      * @param builder The request builder for the next collection page
      */
     public SegmentTestActionCollectionPage(final SegmentTestActionCollectionResponse response, final ISegmentTestActionCollectionRequestBuilder builder) {
-       super(response.value, builder);
+       super(response.value, builder, response.additionalDataManager());
     }
 }
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionPage.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionPage.java
index 5e1452c58..fb62ec400 100644
--- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionPage.java
+++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionPage.java
@@ -23,6 +23,6 @@ public class SessionCollectionPage extends BaseCollectionPage<Session, ISessionC
      * @param builder  the request builder for the next collection page
      */
     public SessionCollectionPage(final SessionCollectionResponse response, final ISessionCollectionRequestBuilder builder) {
-        super(response.value, builder);
+        super(response.value, builder, response.additionalDataManager());
     }
 }

From 994e069517c143808e4e569ce4ceacfbaabdd77b Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 22 Sep 2020 15:04:08 -0400
Subject: [PATCH 2/2] - fixes a bug where response headers for collection pages
 would be absent

---
 .../Java/requests_extensions/BaseEntityCollectionPage.java.tt   | 2 +-
 .../BaseEntityCollectionWithReferencesPage.java.tt              | 2 +-
 .../Java/requests_extensions/BaseMethodCollectionPage.java.tt   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionPage.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionPage.java.tt
index 37c833b5e..f849c4608 100644
--- a/Templates/Java/requests_extensions/BaseEntityCollectionPage.java.tt
+++ b/Templates/Java/requests_extensions/BaseEntityCollectionPage.java.tt
@@ -23,6 +23,6 @@ String s = c.TypeName();
      * @param builder  the request builder for the next collection page
      */
     public <#=c.TypeCollectionPage()#>(final <#=c.TypeCollectionResponse()#> response, final <#=c.ITypeCollectionRequestBuilder()#> builder) {
-        super(response.value, builder);
+        super(response.value, builder, response.additionalDataManager());
     }
 }
diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesPage.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesPage.java.tt
index ce6dcd8de..fa65702f5 100644
--- a/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesPage.java.tt
+++ b/Templates/Java/requests_extensions/BaseEntityCollectionWithReferencesPage.java.tt
@@ -26,6 +26,6 @@ import <#=importNamespace#>.http.BaseCollectionPage;
      * @param builder  the request builder for the next collection page
      */
     public <#=c.TypeCollectionWithReferencesPage()#>(final <#=c.TypeCollectionResponse()#> response, final <#=c.ITypeCollectionWithReferencesRequestBuilder()#> builder) {
-        super(response.value, builder);
+        super(response.value, builder, response.additionalDataManager());
     }
 }
diff --git a/Templates/Java/requests_extensions/BaseMethodCollectionPage.java.tt b/Templates/Java/requests_extensions/BaseMethodCollectionPage.java.tt
index 912730226..12ccb446c 100644
--- a/Templates/Java/requests_extensions/BaseMethodCollectionPage.java.tt
+++ b/Templates/Java/requests_extensions/BaseMethodCollectionPage.java.tt
@@ -47,7 +47,7 @@ import <#=importNamespace#>.http.BaseCollectionPage;
      * @param builder The request builder for the next collection page
      */
     public <#=c.TypeCollectionPage()#>(final <#=c.TypeCollectionResponse()#> response, final <#=c.ITypeCollectionRequestBuilder()#> builder) {
-       super(response.value, builder);
+       super(response.value, builder, response.additionalDataManager());
 <# if (deltaPage) { #>
 
         if (response.getRawObject().get("@odata.deltaLink") != null) {