Merge pull request #463 from microsoftgraph/feature/get-request

Feature/get request

Author: baywet

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-    "java.configuration.updateBuildConfiguration": "interactive"
+    "java.configuration.updateBuildConfiguration": "automatic"
 }

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

@@ -13,13 +13,14 @@
 import java.util.EnumSet;
 
 import com.microsoft.graph.http.IBaseCollectionPage;
+import com.microsoft.graph.http.IHttpRequest;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
 /**
  * The interface for the Call Record Collection Request.
  */
-public interface ICallRecordCollectionRequest {
+public interface ICallRecordCollectionRequest extends IHttpRequest {
 
     void get(final ICallback<ICallRecordCollectionPage> callback);
 

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

@@ -13,13 +13,14 @@
 import java.util.EnumSet;
 
 import com.microsoft.graph.http.IBaseCollectionPage;
+import com.microsoft.graph.http.IHttpRequest;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
 /**
  * The interface for the Segment Collection Request.
  */
-public interface ISegmentCollectionRequest {
+public interface ISegmentCollectionRequest extends IHttpRequest {
 
     void get(final ICallback<ISegmentCollectionPage> callback);
 

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

@@ -13,13 +13,14 @@
 import java.util.EnumSet;
 
 import com.microsoft.graph.http.IBaseCollectionPage;
+import com.microsoft.graph.http.IHttpRequest;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
 /**
  * The interface for the Session Collection Request.
  */
-public interface ISessionCollectionRequest {
+public interface ISessionCollectionRequest extends IHttpRequest {
 
     void get(final ICallback<ISessionCollectionPage> callback);
 

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

@@ -25,6 +25,7 @@
 import java.net.URL;
 import java.util.List;
 
+import com.microsoft.graph.concurrency.IProgressCallback;
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
@@ -34,6 +35,8 @@
 import com.microsoft.graph.options.Option;
 import com.microsoft.graph.options.QueryOption;
 
+import okhttp3.Request;
+
 /**
  * A request against a collection
  *
@@ -297,4 +300,47 @@ public void setDelay(long delay) {
     public long getDelay() {
     	return baseRequest.getDelay();
     }
+
+    /**
+     * Sets the HTTP method and returns the current request
+     *
+     * @param httpMethod the HTTP method
+     * @return the current request
+     */
+    public IHttpRequest withHttpMethod(final HttpMethod httpMethod) {
+        baseRequest.setHttpMethod(httpMethod);
+        return this;
+    }
+    /**
+     * Returns the Request object to be executed
+     * @return the Request object to be executed
+     */
+    @Override
+    public Request getHttpRequest() throws ClientException {
+        return baseRequest.getHttpRequest();
+    }
+
+    /**
+     * Returns the Request object to be executed
+     * @param serializedObject the object to serialize at the body of the request
+     * @param <requestBodyType> the type of the serialized object
+     * @return the Request object to be executed
+     */
+    @Override
+    public <requestBodyType> Request getHttpRequest(final requestBodyType serializedObject) throws ClientException {
+        return baseRequest.getHttpRequest(serializedObject);
+    }
+
+    /**
+     * Returns the Request object to be executed
+     * @param serializedObject the object to serialize at the body of the request
+     * @param progress the progress callback
+     * @param <requestBodyType> the type of the serialized object
+     * @param <responseType> the type of the response object
+     * @return the Request object to be executed
+     */
+    @Override
+    public <requestBodyType, responseType> Request getHttpRequest(final requestBodyType serializedObject, final IProgressCallback<responseType> progress) throws ClientException {
+        return baseRequest.getHttpRequest(serializedObject, progress);
+    }
 }

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

@@ -23,9 +23,13 @@
 package com.microsoft.graph.http;
 
 import okhttp3.HttpUrl;
+import okhttp3.Request;
 import okhttp3.HttpUrl.Builder;
 
 import com.microsoft.graph.concurrency.ICallback;
+import com.microsoft.graph.concurrency.IProgressCallback;
+import com.microsoft.graph.content.MSBatchRequestContent;
+import com.microsoft.graph.content.MSBatchRequestStep;
 import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
 import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
@@ -41,9 +45,11 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * An HTTP request
@@ -190,6 +196,40 @@ public URL getRequestUrl() {
 		return null;
     }
 
+    /**
+     * Returns the Request object to be executed
+     * @return the Request object to be executed
+     */
+    @Override
+    public Request getHttpRequest() throws ClientException {
+        return getHttpRequest(null);
+    }
+
+    /**
+     * Returns the Request object to be executed
+     * @param serializedObject the object to serialize at the body of the request
+     * @param <requestBodyType> the type of the serialized object
+     * @return the Request object to be executed
+     */
+    @Override
+    public <requestBodyType> Request getHttpRequest(final requestBodyType serializedObject) throws ClientException {
+        return getHttpRequest(serializedObject, null);
+    }
+
+    /**
+     * Returns the Request object to be executed
+     * @param serializedObject the object to serialize at the body of the request
+     * @param progress the progress callback
+     * @param <requestBodyType> the type of the serialized object
+     * @param <responseType> the type of the response object
+     * @return the Request object to be executed
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public <requestBodyType, responseType> Request getHttpRequest(final requestBodyType serializedObject, final IProgressCallback<responseType> progress) throws ClientException {
+        return client.getHttpProvider().getHttpRequest(this, (Class<responseType>) responseClass, serializedObject, progress);
+    }
+
     private String addFunctionParameters() {
         final StringBuilder requestUrl = new StringBuilder(this.requestUrl);
 
@@ -363,6 +403,17 @@ public void setHttpMethod(final HttpMethod httpMethod) {
         method = httpMethod;
     }
 
+    /**
+     * Sets the HTTP method and returns the current request
+     *
+     * @param httpMethod the HTTP method
+     * @return the current request
+     */
+    public IHttpRequest withHttpMethod(final HttpMethod httpMethod) {
+        method = httpMethod;
+        return this;
+    }
+
     /**
      * Gets the client
      *

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

@@ -23,6 +23,7 @@
 package com.microsoft.graph.http;
 
 import com.microsoft.graph.concurrency.ICallback;
+import com.microsoft.graph.concurrency.IProgressCallback;
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
@@ -32,6 +33,8 @@
 import com.microsoft.graph.options.HeaderOption;
 import com.microsoft.graph.options.Option;
 
+import okhttp3.Request;
+
 import java.io.InputStream;
 import java.net.URL;
 import java.util.List;
@@ -269,5 +272,48 @@ public void setDelay(long delay) {
     public long getDelay() {
     	return baseRequest.getDelay();
     }
-    
+    /**
+     * Sets the HTTP method and returns the current request
+     *
+     * @param httpMethod the HTTP method
+     * @return the current request
+     */
+    @Override
+    public IHttpRequest withHttpMethod(final HttpMethod httpMethod) {
+        baseRequest.setHttpMethod(httpMethod);
+        return this;
+    }
+
+    /**
+     * Returns the Request object to be executed
+     * @return the Request object to be executed
+     */
+    @Override
+    public Request getHttpRequest() throws ClientException {
+        return baseRequest.getHttpRequest();
+    }
+
+    /**
+     * Returns the Request object to be executed
+     * @param serializedObject the object to serialize at the body of the request
+     * @param <requestBodyType> the type of the serialized object
+     * @return the Request object to be executed
+     */
+    @Override
+    public <requestBodyType> Request getHttpRequest(final requestBodyType serializedObject) throws ClientException {
+        return baseRequest.getHttpRequest(serializedObject);
+    }
+
+    /**
+     * Returns the Request object to be executed
+     * @param serializedObject the object to serialize at the body of the request
+     * @param progress the progress callback
+     * @param <requestBodyType> the type of the serialized object
+     * @param <responseType> the type of the response object
+     * @return the Request object to be executed
+     */
+    @Override
+    public <requestBodyType, responseType> Request getHttpRequest(final requestBodyType serializedObject, final IProgressCallback<responseType> progress) throws ClientException {
+        return baseRequest.getHttpRequest(serializedObject, progress);
+    }
 }