Merge pull request #51 from davidmoten/custom-request-fixes

CustomRequest fixes

Author: Caitlin Bales (MSFT)

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

@@ -29,21 +29,21 @@
 import com.microsoft.graph.options.Option;
 import com.microsoft.graph.options.QueryOption;
 
-public class CustomRequest extends BaseRequest {
+public class CustomRequest<T> extends BaseRequest {
 
-	public CustomRequest(final String requestUrl, final IBaseClient client, final java.util.List<? extends Option> requestOptions, final Class<?> responseClass) {
+	public CustomRequest(final String requestUrl, final IBaseClient client, final java.util.List<? extends Option> requestOptions, final Class<T> responseClass) {
 		super(requestUrl, client, requestOptions, responseClass);
     }
 
-	public CustomRequest(final String requestUrl, final IBaseClient client, final java.util.List<? extends Option> requestOptions) {
-        super(requestUrl, client, requestOptions, JsonObject.class);
+	public static CustomRequest<JsonObject> create(final String requestUrl, final IBaseClient client, final java.util.List<? extends Option> requestOptions) {
+        return new CustomRequest<JsonObject>(requestUrl, client, requestOptions, JsonObject.class);
     }
 
-    public <T> T get() throws ClientException {
+    public T get() throws ClientException {
         return send(HttpMethod.GET, null);
     }
 
-    public <T> void get(final ICallback<T> callback) {
+    public void get(final ICallback<T> callback) {
     	send(HttpMethod.GET, callback, null);
     }
 
@@ -68,8 +68,8 @@ public void delete() throws ClientException {{
      * @param sourceItem The source object with updates
      * @param callback The callback to be called after success or failure.
      */
-    public <T> void patch(final Class<?> sourceObject, final ICallback<T> callback) {
-        send(HttpMethod.PATCH, callback, sourceObject);
+    public void patch(final ICallback<T> callback) {
+        send(HttpMethod.PATCH, callback, super.getResponseType());
     }
 
     /**
@@ -78,26 +78,26 @@ public <T> void patch(final Class<?> sourceObject, final ICallback<T> callback)
      * @return The updated item
      * @throws ClientException This exception occurs if the request was unable to complete for any reason.
      */
-    public <T> T patch(final Class<?> sourceObject) throws ClientException {
+    public T patch(final T sourceObject) throws ClientException {
         return send(HttpMethod.PATCH, sourceObject);
     }
 
     /**
-     * Creates an item with a new object
-     * @param newObject The new object to create
+     * Creates a new object
+     * @param newAttachment The new object to create
      * @param callback The callback to be called after success or failure.
      */
-    public <T> void post(final Class<?> newObject, final ICallback<T> callback) {
+    public void post(final T newObject, final ICallback<T> callback) {
         send(HttpMethod.POST, callback, newObject);
     }
 
     /**
-     * Creates an item with a new object
-     * @param newObject The new object to create
-     * @return The created item
+     * Creates a new object
+     * @param newAttachment The new object to create
+     * @return The created Attachment
      * @throws ClientException This exception occurs if the request was unable to complete for any reason.
      */
-    public <T> T post(final Class<?> newObject) throws ClientException {
+    public T post(final T newObject) throws ClientException {
         return send(HttpMethod.POST, newObject);
     }
 
@@ -107,7 +107,7 @@ public <T> T post(final Class<?> newObject) throws ClientException {
      * @param value The select clause
      * @return The updated request
      */
-     public CustomRequest select(final String value) {
+     public CustomRequest<T> select(final String value) {
          getQueryOptions().add(new QueryOption("$select", value));
          return this;
      }
@@ -118,7 +118,7 @@ public CustomRequest select(final String value) {
      * @param value The expand clause
      * @return The updated request
      */
-     public CustomRequest expand(final String value) {
+     public CustomRequest<T> expand(final String value) {
          getQueryOptions().add(new QueryOption("$expand", value));
          return this;
      }

src/main/java/com/microsoft/graph/models/extensions/IGraphServiceClient.java

@@ -4,18 +4,9 @@
 
 package com.microsoft.graph.models.extensions;
 
-import com.microsoft.graph.concurrency.*;
-import com.microsoft.graph.core.*;
-import com.microsoft.graph.models.extensions.*;
-import com.microsoft.graph.models.generated.*;
-import com.microsoft.graph.http.*;
-import com.microsoft.graph.requests.extensions.*;
-import com.microsoft.graph.requests.generated.*;
-import com.microsoft.graph.options.*;
-import com.microsoft.graph.serializer.*;
-
-import java.util.Arrays;
-import java.util.EnumSet;
+import com.google.gson.JsonObject;
+import com.microsoft.graph.models.generated.IBaseGraphServiceClient;
+import com.microsoft.graph.requests.extensions.CustomRequestBuilder;
 
 // This file is available for extending, afterwards please submit a pull request.
 
@@ -24,7 +15,7 @@
  */
 public interface IGraphServiceClient extends IBaseGraphServiceClient {
 
-	CustomRequestBuilder customRequest(final String url, final Class<?> responseType);
+	<T> CustomRequestBuilder<T> customRequest(final String url, final Class<T> responseType);
 
-	CustomRequestBuilder customRequest(final String url);
+	CustomRequestBuilder<JsonObject> customRequest(final String url);
 }

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

@@ -5,27 +5,26 @@
 import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.http.BaseRequestBuilder;
 import com.microsoft.graph.http.CustomRequest;
-import com.microsoft.graph.requests.extensions.GraphServiceClient;
 import com.microsoft.graph.options.Option;
 
 /**
  * The class for the CustomRequestBuilder
  *
  * @throws ClientException If the provided URL is malformed, the client exception will contain a MalformedURLException
  */
-public class CustomRequestBuilder extends BaseRequestBuilder {
-	public final Class<?> responseType; 
+public class CustomRequestBuilder<T> extends BaseRequestBuilder {
+	public final Class<T> responseType; 
 
-	public CustomRequestBuilder(final String requestUrl, final IBaseClient client, final List<? extends Option> requestOptions, final Class<?> responseType) {
+	public CustomRequestBuilder(final String requestUrl, final IBaseClient client, final List<? extends Option> requestOptions, final Class<T> responseType) {
 		super(requestUrl, client, requestOptions);
 		this.responseType = responseType;
 	}
 
-	public CustomRequest buildRequest() {
+	public CustomRequest<T> buildRequest() {
 		return buildRequest(getOptions());
 	}
 
-	public CustomRequest buildRequest(final List<? extends Option> requestOptions) {
-		return new CustomRequest(getRequestUrl(), getClient(), requestOptions, responseType);
+	public CustomRequest<T> buildRequest(final List<? extends Option> requestOptions) {
+		return new CustomRequest<T>(getRequestUrl(), getClient(), requestOptions, responseType);
 	}
 }