Merge pull request #206 from microsoftgraph/custom-request-fix

Put added in custom request.

Author: deepak2016

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

@@ -105,6 +105,27 @@ public void post(final T newObject, final ICallback<T> callback) {
     public T post(final T newObject) throws ClientException {
         return send(HttpMethod.POST, newObject);
     }
+    
+    /**
+     * Creates a new object
+     * 
+     * @param putObject the new object to create
+     * @param callback  the callback to be called after success or failure
+     */
+    public void put(final T putObject, final ICallback<T> callback) {
+        send(HttpMethod.PUT, callback, putObject);
+    }
+    
+    /**
+     * Creates a new object
+     * 
+     * @param putObject        the new object to create
+     * @return                 the created object
+     * @throws ClientException this exception occurs if the request was unable to complete for any reason
+     */
+    public T put(final T putObject) throws ClientException {
+        return send(HttpMethod.PUT, putObject);
+    }
 
     /**
      * Sets the select clause for the request

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

@@ -1,13 +1,18 @@
 package com.microsoft.graph.functional;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.microsoft.graph.logger.DefaultLogger;
 import com.microsoft.graph.models.extensions.User;
+import com.microsoft.graph.models.extensions.UserActivity;
+import com.microsoft.graph.serializer.DefaultSerializer;
 
 /**
  * Tests for sending custom requests using the SDK
@@ -41,4 +46,34 @@ public void testCustomGet() {
 		assertEquals(meGraphService.displayName, meOriginal.displayName);
 		assertEquals(meJson.get("displayName").getAsString(), meOriginal.displayName);
 	}
+	
+	/**
+	 * Test PUT with a custom request for both serialized and JSON content
+	 */
+	@Test
+	public void testCustomPut() {
+		JsonParser parser =  new JsonParser();
+		DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
+		String str = "{ \"appActivityId\": \"/article?12345\", \"activitySourceHost\": \"https://www.contoso.com\", \"userTimezone\": \"Africa/Casablanca\","
+				+ " \"appDisplayName\": \"Contoso, Ltd.\", \"activationUrl\": \"https://www.contoso.com/article?id=12345\", \"contentUrl\": \"https://www.contoso.com/article?id=12345\", "
+				+ "\"fallbackUrl\": \"https://www.contoso.com/article?id=12345\", \"contentInfo\": { \"@context\": \"https://schema.org\", \"@type\": \"Article\", \"author\": \"Jennifer Booth\", "
+				+ "\"name\": \"How to Tie a Reef Knot\" }, \"visualElements\": { \"attribution\": { \"iconUrl\": \"https://www.contoso.com/icon\", \"alternateText\": \"Contoso, Ltd.\", "
+				+ "\"addImageQuery\": false }, \"description\": \"How to Tie a Reef Knot. A step-by-step visual guide to the art of nautical knot-tying.\", \"backgroundColor\": \"#ff0000\","
+				+ " \"displayText\": \"Contoso How-To: How to Tie a Reef Knot\", \"content\": { \"$schema\": \"https://adaptivecards.io/schemas/adaptive-card.json\", \"type\": \"AdaptiveCard\","
+				+ " \"body\": [{ \"type\": \"TextBlock\", \"text\": \"Contoso MainPage\" }] } } }";
+		
+		JsonObject response = testBase.graphClient.
+				customRequest("/me/activities/%2Farticle%3F12346").
+				buildRequest().
+				put(parser.parse(str).getAsJsonObject());
+		
+		UserActivity userActivity = serializer.deserializeObject(str, UserActivity.class); 
+		UserActivity responseWithClass = testBase.graphClient.
+				customRequest("/me/activities/2", UserActivity.class).
+				buildRequest().
+				put(userActivity);
+		
+		assertNotNull(response);
+		assertNotNull(responseWithClass);
+	}
 }