Merge pull request #19 from microsoftgraph/custom-requests

Custom requests

Author: Caitlin Bales (MSFT)

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

@@ -24,24 +24,10 @@
 
 import com.google.gson.JsonObject;
 import com.microsoft.graph.concurrency.ICallback;
-import com.microsoft.graph.concurrency.IExecutors;
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.models.extensions.Attachment;
-import com.microsoft.graph.models.extensions.Calendar;
 import com.microsoft.graph.options.Option;
 import com.microsoft.graph.options.QueryOption;
-import com.microsoft.graph.requests.extensions.AttachmentRequest;
-import com.microsoft.graph.requests.extensions.CalendarCollectionPage;
-import com.microsoft.graph.requests.extensions.CalendarCollectionRequest;
-import com.microsoft.graph.requests.extensions.CalendarCollectionRequestBuilder;
-import com.microsoft.graph.requests.extensions.CalendarRequestBuilder;
-import com.microsoft.graph.requests.extensions.IAttachmentRequest;
-import com.microsoft.graph.requests.extensions.ICalendarCollectionPage;
-import com.microsoft.graph.requests.extensions.ICalendarCollectionRequest;
-import com.microsoft.graph.requests.extensions.ICalendarCollectionRequestBuilder;
-import com.microsoft.graph.requests.generated.BaseCalendarCollectionResponse;
-import com.microsoft.graph.serializer.IJsonBackedObject;
 
 public class CustomRequest extends BaseRequest {
 

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/test/java/com/microsoft/graph/functional/CustomRequestTests.java

@@ -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) {