Custom request scratch

Author: Caitlin Bales (MSFT)

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

@@ -43,7 +43,7 @@
 import com.microsoft.graph.requests.generated.BaseCalendarCollectionResponse;
 import com.microsoft.graph.serializer.IJsonBackedObject;
 
-public class CustomRequest extends BaseRequest {
+public class CustomRequest<T> extends BaseRequest {
 
 	public CustomRequest(final String requestUrl, final IBaseClient client, final java.util.List<Option> requestOptions, final Class responseClass) {
 		super(requestUrl, client, requestOptions, responseClass);

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

@@ -41,7 +41,7 @@ protected GraphServiceClient() {
      * @return the instance of this builder
      */
     public CustomRequestBuilder customRequest(final String url, final Class responseType) {
-    	return new CustomRequestBuilder(url, (IGraphServiceClient)this, null, responseType);
+    	return new CustomRequestBuilder(getServiceRoot() + url, (IGraphServiceClient)this, null, responseType);
     }
 
     /**
@@ -50,7 +50,7 @@ public CustomRequestBuilder customRequest(final String url, final Class response
      * @return the instance of this builder
      */
     public CustomRequestBuilder customRequest(final String url) {
-    	return new CustomRequestBuilder(url, (IGraphServiceClient)this, null, JsonObject.class);
+    	return new CustomRequestBuilder(getServiceRoot() + url, (IGraphServiceClient)this, null, JsonObject.class);
     }
 
     public static Builder builder() {

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

@@ -8,19 +8,19 @@
 import com.microsoft.graph.models.extensions.GraphServiceClient;
 import com.microsoft.graph.options.Option;
 
-public class CustomRequestBuilder extends BaseRequestBuilder {
-	public final Class responseType; 
+public class CustomRequestBuilder<T> extends BaseRequestBuilder {
+	//public final Class responseType; 
 
 	public CustomRequestBuilder(final String requestUrl, final IBaseClient client, final List<Option> requestOptions, final Class responseType) {
 		super(requestUrl, client, requestOptions);
-		this.responseType = responseType;
+		//this.responseType = responseType;
 	}
 
 	public CustomRequest buildRequest() {
 		return buildRequest(getOptions());
 	}
 
 	public CustomRequest buildRequest(final List<Option> requestOptions) {
-		return new CustomRequest(getRequestUrl(), getClient(), requestOptions, responseType);
+		return new CustomRequest(getRequestUrl(), getClient(), requestOptions);
 	}
 }

src/test/java/com/microsoft/graph/functional/CustomRequestTests.java

@@ -12,7 +12,7 @@
 /**
  * Tests for sending custom requests using the SDK
  */
-@Ignore
+//@Ignore
 public class CustomRequestTests {
 	private TestBase testBase;
 
@@ -29,12 +29,12 @@ public void testCustomGet() {
 		User meOriginal = testBase.graphClient.me().buildRequest().get();
 
 		User meGraphService = testBase.graphClient
-				.customRequest("https://graph.microsoft.com/v1.0/me", User.class)
+				.customRequest("/me", User.class)
 				.buildRequest()
 				.get();
 
 		JsonObject meJson = testBase.graphClient
-				.customRequest("https://graph.microsoft.com/v1.0/me")
+				.customRequest("/me")
 				.buildRequest()
 				.get();
 

src/test/java/com/microsoft/graph/functional/TestBase.java

@@ -43,7 +43,7 @@ private void GetAuthenticatedClient()
     {
         if (graphClient == null) {
             try {
-                accessToken = GetAccessToken();
+                accessToken = GetAccessToken().replace("\"", "");
                 IAuthenticationProvider mAuthenticationProvider = new IAuthenticationProvider() {
                     @Override
                     public void authenticateRequest(final IHttpRequest request) {