- fixes #8 adds a vararg implementation for options in buildrequest by baywet · Pull Request #477

- fixes #8 adds a vararg implementation for options in buildrequest by baywet · Pull Request #477 · microsoftgraph/msgraph-sdk-java

Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,10 +36,22 @@ public CallRecordCollectionRequestBuilder(final String requestUrl, final IBaseCl
		super(requestUrl, client, requestOptions);
		}

		public ICallRecordCollectionRequest buildRequest() {
		return buildRequest(getOptions());
		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		public ICallRecordCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
		return buildRequest(getOptions(requestOptions));
		}

		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		public ICallRecordCollectionRequest buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
		return new CallRecordCollectionRequest(getRequestUrl(), getClient(), requestOptions);
		}
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,10 +38,11 @@ public CallRecordRequestBuilder(final String requestUrl, final IBaseClient clien
		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the ICallRecordRequest instance
		*/
		public ICallRecordRequest buildRequest() {
		return buildRequest(getOptions());
		public ICallRecordRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
		return buildRequest(getOptions(requestOptions));
		}

		/**
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,8 +23,20 @@
		*/
		public interface ICallRecordCollectionRequestBuilder extends IRequestBuilder {

		ICallRecordCollectionRequest buildRequest();

		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		ICallRecordCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions);

		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		ICallRecordCollectionRequest buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions);

		ICallRecordRequestBuilder byId(final String id);
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,9 +22,10 @@ public interface ICallRecordRequestBuilder extends IRequestBuilder {
		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the ICallRecordRequest instance
		*/
		ICallRecordRequest buildRequest();
		ICallRecordRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions);

		/**
		* Creates the request with specific options instead of the existing options
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,8 +23,20 @@
		*/
		public interface ISegmentCollectionRequestBuilder extends IRequestBuilder {

		ISegmentCollectionRequest buildRequest();

		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		ISegmentCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions);

		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		ISegmentCollectionRequest buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions);

		ISegmentRequestBuilder byId(final String id);
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,9 +20,10 @@ public interface ISegmentRequestBuilder extends IRequestBuilder {
		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the ISegmentRequest instance
		*/
		ISegmentRequest buildRequest();
		ISegmentRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions);

		/**
		* Creates the request with specific options instead of the existing options
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,8 +23,20 @@
		*/
		public interface ISessionCollectionRequestBuilder extends IRequestBuilder {

		ISessionCollectionRequest buildRequest();

		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		ISessionCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions);

		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		ISessionCollectionRequest buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions);

		ISessionRequestBuilder byId(final String id);
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,9 +22,10 @@ public interface ISessionRequestBuilder extends IRequestBuilder {
		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the ISessionRequest instance
		*/
		ISessionRequest buildRequest();
		ISessionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions);

		/**
		* Creates the request with specific options instead of the existing options
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,10 +36,22 @@ public SegmentCollectionRequestBuilder(final String requestUrl, final IBaseClien
		super(requestUrl, client, requestOptions);
		}

		public ISegmentCollectionRequest buildRequest() {
		return buildRequest(getOptions());
		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		public ISegmentCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
		return buildRequest(getOptions(requestOptions));
		}

		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		public ISegmentCollectionRequest buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
		return new SegmentCollectionRequest(getRequestUrl(), getClient(), requestOptions);
		}
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,10 +34,11 @@ public SegmentRequestBuilder(final String requestUrl, final IBaseClient client,
		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the ISegmentRequest instance
		*/
		public ISegmentRequest buildRequest() {
		return buildRequest(getOptions());
		public ISegmentRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
		return buildRequest(getOptions(requestOptions));
		}

		/**
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,10 +36,22 @@ public SessionCollectionRequestBuilder(final String requestUrl, final IBaseClien
		super(requestUrl, client, requestOptions);
		}

		public ISessionCollectionRequest buildRequest() {
		return buildRequest(getOptions());
		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		public ISessionCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
		return buildRequest(getOptions(requestOptions));
		}

		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		public ISessionCollectionRequest buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
		return new SessionCollectionRequest(getRequestUrl(), getClient(), requestOptions);
		}
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,10 +38,11 @@ public SessionRequestBuilder(final String requestUrl, final IBaseClient client,
		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the ISessionRequest instance
		*/
		public ISessionRequest buildRequest() {
		return buildRequest(getOptions());
		public ISessionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
		return buildRequest(getOptions(requestOptions));
		}

		/**
Expand Down

8 changes: 6 additions & 2 deletions src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java

Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,6 +28,7 @@
		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.List;
		import java.util.Arrays;

		/**
		* A request builder
Expand Down Expand Up		@@ -89,10 +90,13 @@ public String getRequestUrl() {
		/**
		* Get the full list of options for this request
		*
		* @param requestOptions the options for this request
		* @return the full list of options for this request
		*/
		public List<? extends Option> getOptions() {
		return Collections.unmodifiableList(options);
		public List<? extends Option> getOptions(final Option... requestOptions) {
		return Collections.unmodifiableList(requestOptions != null && requestOptions.length > 0 ?
		Arrays.asList(requestOptions)
		: options);
		}

		/**
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,10 +36,11 @@ public AadUserConversationMemberRequestBuilder(final String requestUrl, final IB
		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IAadUserConversationMemberRequest instance
		*/
		public IAadUserConversationMemberRequest buildRequest() {
		return buildRequest(getOptions());
		public IAadUserConversationMemberRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
		return buildRequest(getOptions(requestOptions));
		}

		/**
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,10 +36,22 @@ public ActivityBasedTimeoutPolicyCollectionRequestBuilder(final String requestUr
		super(requestUrl, client, requestOptions);
		}

		public IActivityBasedTimeoutPolicyCollectionRequest buildRequest() {
		return buildRequest(getOptions());
		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		public IActivityBasedTimeoutPolicyCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
		return buildRequest(getOptions(requestOptions));
		}

		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		public IActivityBasedTimeoutPolicyCollectionRequest buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
		return new ActivityBasedTimeoutPolicyCollectionRequest(getRequestUrl(), getClient(), requestOptions);
		}
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,10 +34,11 @@ public ActivityBasedTimeoutPolicyRequestBuilder(final String requestUrl, final I
		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IActivityBasedTimeoutPolicyRequest instance
		*/
		public IActivityBasedTimeoutPolicyRequest buildRequest() {
		return buildRequest(getOptions());
		public IActivityBasedTimeoutPolicyRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
		return buildRequest(getOptions(requestOptions));
		}

		/**
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,10 +36,22 @@ public ActivityHistoryItemCollectionRequestBuilder(final String requestUrl, fina
		super(requestUrl, client, requestOptions);
		}

		public IActivityHistoryItemCollectionRequest buildRequest() {
		return buildRequest(getOptions());
		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		public IActivityHistoryItemCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
		return buildRequest(getOptions(requestOptions));
		}

		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		public IActivityHistoryItemCollectionRequest buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
		return new ActivityHistoryItemCollectionRequest(getRequestUrl(), getClient(), requestOptions);
		}
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,10 +36,11 @@ public ActivityHistoryItemRequestBuilder(final String requestUrl, final IBaseCli
		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IActivityHistoryItemRequest instance
		*/
		public IActivityHistoryItemRequest buildRequest() {
		return buildRequest(getOptions());
		public IActivityHistoryItemRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
		return buildRequest(getOptions(requestOptions));
		}

		/**
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,11 +35,23 @@ public class AdministrativeUnitDeltaCollectionRequestBuilder extends BaseFunctio
		public AdministrativeUnitDeltaCollectionRequestBuilder(final String requestUrl, final IBaseClient client, final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
		super(requestUrl, client, requestOptions);
		}

		public IAdministrativeUnitDeltaCollectionRequest buildRequest() {
		return buildRequest(getOptions());

		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		public IAdministrativeUnitDeltaCollectionRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
		return buildRequest(getOptions(requestOptions));
		}

		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IUserRequest instance
		*/
		public IAdministrativeUnitDeltaCollectionRequest buildRequest(final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
		AdministrativeUnitDeltaCollectionRequest request = new AdministrativeUnitDeltaCollectionRequest(
		getRequestUrl(),
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,10 +34,11 @@ public AdministrativeUnitRequestBuilder(final String requestUrl, final IBaseClie
		/**
		* Creates the request
		*
		* @param requestOptions the options for this request
		* @return the IAdministrativeUnitRequest instance
		*/
		public IAdministrativeUnitRequest buildRequest() {
		return buildRequest(getOptions());
		public IAdministrativeUnitRequest buildRequest(final com.microsoft.graph.options.Option... requestOptions) {
		return buildRequest(getOptions(requestOptions));
		}

		/**
Expand Down