From 49ac1cc6a8ed051aede2fe79fd4c381387fe1666 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 3 Sep 2020 10:02:08 -0400 Subject: [PATCH 1/2] - fixes a bug where url options would be inserted twice for collection POST requests --- .../BaseEntityCollectionReferenceRequest.java.tt | 4 ++-- .../requests_extensions/BaseEntityCollectionRequest.java.tt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequest.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequest.java.tt index 0ce9a3266..4ca57274b 100644 --- a/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequest.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityCollectionReferenceRequest.java.tt @@ -42,7 +42,7 @@ import <#=mainNamespace#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>; final String requestUrl = getBaseRequest().getRequestUrl().toString(); final ReferenceRequestBody body = new ReferenceRequestBody(getBaseRequest().getClient().getServiceRoot() + "/<#=prop#>/<#=implicitNavigationProperty#>" + new<#=c.TypeName()#>.id); new <#=c.TypeWithReferencesRequestBuilder()#>(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(new<#=c.TypeName()#>, body, callback); } @@ -50,7 +50,7 @@ import <#=mainNamespace#>.<#=c.GetPackagePrefix()#>.<#=c.TypeName()#>; final String requestUrl = getBaseRequest().getRequestUrl().toString(); final ReferenceRequestBody body = new ReferenceRequestBody(getBaseRequest().getClient().getServiceRoot() + "/<#=prop#>/<#=implicitNavigationProperty#>" + new<#=c.TypeName()#>.id); return new <#=c.TypeWithReferencesRequestBuilder()#>(requestUrl,getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(new<#=c.TypeName()#>, body); } <# } diff --git a/Templates/Java/requests_extensions/BaseEntityCollectionRequest.java.tt b/Templates/Java/requests_extensions/BaseEntityCollectionRequest.java.tt index db7154f02..3c2033e91 100644 --- a/Templates/Java/requests_extensions/BaseEntityCollectionRequest.java.tt +++ b/Templates/Java/requests_extensions/BaseEntityCollectionRequest.java.tt @@ -53,14 +53,14 @@ import <#=mainNamespace#>.<#=TypeHelperJava.GetPrefixForRequests()#>.<#=c.TypeCo public void post(final <#=c.TypeName()#> new<#=c.TypeName()#>, final ICallback<<#=c.TypeName()#>> callback) { final String requestUrl = getBaseRequest().getRequestUrl().toString(); new <#=c.TypeRequestBuilder()#>(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(new<#=c.TypeName()#>, callback); } public <#=c.TypeName()#> post(final <#=c.TypeName()#> new<#=c.TypeName()#>) throws ClientException { final String requestUrl = getBaseRequest().getRequestUrl().toString(); return new <#=c.TypeRequestBuilder()#>(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(new<#=c.TypeName()#>); } From dae9dc576fc79c957ce83c5a1d7200bfdc5d9e33 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 3 Sep 2020 10:12:11 -0400 Subject: [PATCH 2/2] - updates unit test files --- .../graph/requests/extensions/CallCollectionRequest.java | 4 ++-- .../requests/extensions/EntityType2CollectionRequest.java | 4 ++-- .../extensions/EntityType3CollectionReferenceRequest.java | 4 ++-- .../requests/extensions/EntityType3CollectionRequest.java | 4 ++-- .../graph/requests/extensions/TimeOffCollectionRequest.java | 4 ++-- .../requests/extensions/TimeOffRequestCollectionRequest.java | 4 ++-- .../requests/extensions/CallRecordCollectionRequest.java | 4 ++-- .../requests/extensions/SegmentCollectionRequest.java | 4 ++-- .../requests/extensions/SessionCollectionRequest.java | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionRequest.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionRequest.java index 6b932c67b..f14646c0a 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionRequest.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/CallCollectionRequest.java @@ -62,14 +62,14 @@ public ICallCollectionPage get() throws ClientException { public void post(final Call newCall, final ICallback callback) { final String requestUrl = getBaseRequest().getRequestUrl().toString(); new CallRequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newCall, callback); } public Call post(final Call newCall) throws ClientException { final String requestUrl = getBaseRequest().getRequestUrl().toString(); return new CallRequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newCall); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionRequest.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionRequest.java index f14c1e734..13911da52 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionRequest.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType2CollectionRequest.java @@ -62,14 +62,14 @@ public IEntityType2CollectionPage get() throws ClientException { public void post(final EntityType2 newEntityType2, final ICallback callback) { final String requestUrl = getBaseRequest().getRequestUrl().toString(); new EntityType2RequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newEntityType2, callback); } public EntityType2 post(final EntityType2 newEntityType2) throws ClientException { final String requestUrl = getBaseRequest().getRequestUrl().toString(); return new EntityType2RequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newEntityType2); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionReferenceRequest.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionReferenceRequest.java index 022d9dc45..08275aefb 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionReferenceRequest.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionReferenceRequest.java @@ -42,7 +42,7 @@ public void post(final EntityType3 newEntityType3, final ICallback final String requestUrl = getBaseRequest().getRequestUrl().toString(); final ReferenceRequestBody body = new ReferenceRequestBody(getBaseRequest().getClient().getServiceRoot() + "/testTypes/" + newEntityType3.id); new EntityType3WithReferenceRequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newEntityType3, body, callback); } @@ -50,7 +50,7 @@ public EntityType3 post(final EntityType3 newEntityType3) throws ClientException final String requestUrl = getBaseRequest().getRequestUrl().toString(); final ReferenceRequestBody body = new ReferenceRequestBody(getBaseRequest().getClient().getServiceRoot() + "/testTypes/" + newEntityType3.id); return new EntityType3WithReferenceRequestBuilder(requestUrl,getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newEntityType3, body); } /** diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionRequest.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionRequest.java index f488b473f..157b61fb7 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionRequest.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/EntityType3CollectionRequest.java @@ -63,14 +63,14 @@ public IEntityType3CollectionPage get() throws ClientException { public void post(final EntityType3 newEntityType3, final ICallback callback) { final String requestUrl = getBaseRequest().getRequestUrl().toString(); new EntityType3RequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newEntityType3, callback); } public EntityType3 post(final EntityType3 newEntityType3) throws ClientException { final String requestUrl = getBaseRequest().getRequestUrl().toString(); return new EntityType3RequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newEntityType3); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionRequest.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionRequest.java index 1f3d1b7f5..9e8664215 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionRequest.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffCollectionRequest.java @@ -62,14 +62,14 @@ public ITimeOffCollectionPage get() throws ClientException { public void post(final TimeOff newTimeOff, final ICallback callback) { final String requestUrl = getBaseRequest().getRequestUrl().toString(); new TimeOffRequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newTimeOff, callback); } public TimeOff post(final TimeOff newTimeOff) throws ClientException { final String requestUrl = getBaseRequest().getRequestUrl().toString(); return new TimeOffRequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newTimeOff); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionRequest.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionRequest.java index a5ce32d62..fda9cf8a3 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionRequest.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/requests/extensions/TimeOffRequestCollectionRequest.java @@ -63,14 +63,14 @@ public ITimeOffRequestCollectionPage get() throws ClientException { public void post(final TimeOffRequest newTimeOffRequest, final ICallback callback) { final String requestUrl = getBaseRequest().getRequestUrl().toString(); new TimeOffRequestRequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newTimeOffRequest, callback); } public TimeOffRequest post(final TimeOffRequest newTimeOffRequest) throws ClientException { final String requestUrl = getBaseRequest().getRequestUrl().toString(); return new TimeOffRequestRequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newTimeOffRequest); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionRequest.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionRequest.java index 345c65f8b..60d7d97b1 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionRequest.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/CallRecordCollectionRequest.java @@ -62,14 +62,14 @@ public ICallRecordCollectionPage get() throws ClientException { public void post(final CallRecord newCallRecord, final ICallback callback) { final String requestUrl = getBaseRequest().getRequestUrl().toString(); new CallRecordRequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newCallRecord, callback); } public CallRecord post(final CallRecord newCallRecord) throws ClientException { final String requestUrl = getBaseRequest().getRequestUrl().toString(); return new CallRecordRequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newCallRecord); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionRequest.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionRequest.java index 5cc03f98e..bb13e3225 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionRequest.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SegmentCollectionRequest.java @@ -64,14 +64,14 @@ public ISegmentCollectionPage get() throws ClientException { public void post(final Segment newSegment, final ICallback callback) { final String requestUrl = getBaseRequest().getRequestUrl().toString(); new SegmentRequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newSegment, callback); } public Segment post(final Segment newSegment) throws ClientException { final String requestUrl = getBaseRequest().getRequestUrl().toString(); return new SegmentRequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newSegment); } diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionRequest.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionRequest.java index b45392467..8fe9b969c 100644 --- a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionRequest.java +++ b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/requests/extensions/SessionCollectionRequest.java @@ -62,14 +62,14 @@ public ISessionCollectionPage get() throws ClientException { public void post(final Session newSession, final ICallback callback) { final String requestUrl = getBaseRequest().getRequestUrl().toString(); new SessionRequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newSession, callback); } public Session post(final Session newSession) throws ClientException { final String requestUrl = getBaseRequest().getRequestUrl().toString(); return new SessionRequestBuilder(requestUrl, getBaseRequest().getClient(), /* Options */ null) - .buildRequest(getBaseRequest().getOptions()) + .buildRequest(getBaseRequest().getHeaders()) .post(newSession); }