Fixing review comments on PR : #2

Author: deepak2016

src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java

@@ -41,7 +41,8 @@ public boolean addBatchRequestStep(MSBatchRequestStep batchRequestStep) {
 		return batchRequestStepsArray.add(batchRequestStep);
 	}
 
-	public void removeBatchRequesStepWithId(String requestId) {
+	public boolean removeBatchRequesStepWithId(String requestId) {
+		boolean ret = false;
 		for (int i = batchRequestStepsArray.size()-1; i >= 0; i--)
 	    {
 	        MSBatchRequestStep requestStep = batchRequestStepsArray.get(i);
@@ -51,11 +52,15 @@ public void removeBatchRequesStepWithId(String requestId) {
 	            if(dependsOnId.compareTo(requestId) == 0)
 	            {
 	                requestStep.getArrayOfDependsOnIds().remove(j);
+	                ret = true;
 	            }
 	        }
-	        if(requestId.compareTo(requestStep.getRequestId()) == 0)
+	        if(requestId.compareTo(requestStep.getRequestId()) == 0) {
 	            batchRequestStepsArray.remove(i);
+	            ret = true;
+	        }
 	    }
+		return ret;
 	}
 
 	public String getBatchRequestContent() {

src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java

@@ -17,7 +17,8 @@ public AuthenticationHandler(IAuthenticationProvider authProvider) {
 
 	@Override
 	public void process(HttpRequest request, HttpContext context) throws HttpException, IOException {
-		authProvider.authenticateRequest(request);
+		String token = authProvider.getAccessToken();
+		request.addHeader("Authorization", "Bearer " + token);
 	}
 
 }

src/main/java/com/microsoft/graph/httpcore/IAuthenticationProvider.java

@@ -4,9 +4,9 @@
 
 public interface IAuthenticationProvider {
 	/**
-     * Authenticates the request
+     * Get Access Token
      * 
-     * @param request the request to authenticate
      */
-    void authenticateRequest(final HttpRequest request);
+    
+    String getAccessToken();
 }

src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java

@@ -17,11 +17,8 @@ public class AuthenticationHandlerTest {
 	static String token = "TEST-TOKEN";
 
 	public static class AuthProvider implements IAuthenticationProvider{
-		public static String getToken() {
-			return "Bearer " + token;
-		}
-		public void authenticateRequest(HttpRequest request) {
-			request.addHeader("Authorization", AuthProvider.getToken());
+		public String getAccessToken() {
+			return token;
 		}
 	}
 

src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java

@@ -2,7 +2,6 @@
 
 import static org.junit.Assert.assertTrue;
 
-import org.apache.http.HttpRequest;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.junit.Test;
 
@@ -12,8 +11,8 @@ public class HttpClientsTest {
 	public void testHttpClientCreation() {
 		IAuthenticationProvider authprovider = new IAuthenticationProvider() {
 			@Override
-			public void authenticateRequest(HttpRequest request) {
-				request.addHeader("Authorization", "TOKEN");
+			public String getAccessToken() {
+				return "TOKEN";
 			}
 		};
 		CloseableHttpClient httpclient = HttpClients.createDefault(authprovider);

src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java

@@ -77,7 +77,7 @@ public void testRetryRequestWithExponentialBackOff() {
 			HttpClientContext localContext = HttpClientContext.create();
 			localContext.setAttribute(HttpCoreContext.HTTP_REQUEST, httppost);
 			assertTrue(retryhandler.retryRequest(response, 1, localContext));
-			assertTrue(retryhandler.getRetryInterval() == 20);
+			assertTrue(retryhandler.getRetryInterval() == 2000);
 
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();