Merge pull request #86 from daboxu/dev

nit

Author: daboxu

onedrivesdk/src/main/java/com/onedrive/sdk/authentication/ADALAuthenticator.java

@@ -422,7 +422,10 @@ public void onError(final Exception e) {
             }
         };
 
-        mAdalContext.acquireTokenSilent(mOneDriveServiceInfo.get().serviceResourceId, getClientId(), mUserId.get(), callback);
+        mAdalContext.acquireTokenSilent(mOneDriveServiceInfo.get().serviceResourceId,
+                getClientId(),
+                mUserId.get(),
+                callback);
 
         loginSilentWaiter.waitForSignal();
         //noinspection ThrowableResultOfMethodCallIgnored

onedrivesdk/src/main/java/com/onedrive/sdk/http/BaseRequest.java

@@ -106,10 +106,10 @@ public BaseRequest(final String requestUrl,
         if (options != null) {
             for (final Option option : options) {
                 if (option instanceof HeaderOption) {
-                    mHeadersOptions.add((HeaderOption)option);
+                    mHeadersOptions.add((HeaderOption) option);
                 }
                 if (option instanceof QueryOption) {
-                    mQueryOptions.add((QueryOption)option);
+                    mQueryOptions.add((QueryOption) option);
                 }
             }
         }
@@ -120,12 +120,15 @@ public BaseRequest(final String requestUrl,
 
     /**
      * Gets the request url.
+     *
      * @return The request url.
      */
     @Override
     public URL getRequestUrl() {
         Uri baseUrl = Uri.parse(mRequestUrl);
-        final Uri.Builder uriBuilder = new Uri.Builder().scheme(baseUrl.getScheme()).encodedAuthority(baseUrl.getEncodedAuthority());
+        final Uri.Builder uriBuilder = new Uri.Builder()
+                .scheme(baseUrl.getScheme())
+                .encodedAuthority(baseUrl.getEncodedAuthority());
 
         for (final String segment : baseUrl.getPathSegments()) {
             uriBuilder.appendPath(segment);
@@ -145,6 +148,7 @@ public URL getRequestUrl() {
 
     /**
      * Gets the http method.
+     *
      * @return The http method.
      */
     @Override
@@ -154,6 +158,7 @@ public HttpMethod getHttpMethod() {
 
     /**
      * Gets the headers.
+     *
      * @return The headers.
      */
     @Override
@@ -205,6 +210,7 @@ protected <T1, T2> T1 send(final HttpMethod method,
 
     /**
      * Gets the query options for this request.
+     *
      * @return The query options for this request.
      */
     public List<QueryOption> getQueryOptions() {
@@ -213,6 +219,7 @@ public List<QueryOption> getQueryOptions() {
 
     /**
      * Gets the full list of options for this request.
+     *
      * @return The full list of options for this request.
      */
     public List<Option> getOptions() {
@@ -224,6 +231,7 @@ public List<Option> getOptions() {
 
     /**
      * Sets the http method.
+     *
      * @param httpMethod The http method.
      */
     public void setHttpMethod(final HttpMethod httpMethod) {
@@ -232,6 +240,7 @@ public void setHttpMethod(final HttpMethod httpMethod) {
 
     /**
      * Gets the client.
+     *
      * @return The client.
      */
     public IOneDriveClient getClient() {
@@ -240,6 +249,7 @@ public IOneDriveClient getClient() {
 
     /**
      * Gets the response type.
+     *
      * @return The response type.
      */
     public Class getResponseType() {

onedrivesdk/src/main/java/com/onedrive/sdk/http/DefaultHttpProvider.java

@@ -50,12 +50,12 @@ public class DefaultHttpProvider implements IHttpProvider {
     /**
      * The content type header
      */
-    static final String ContentTypeHeaderName = "Content-Type";
+    static final String CONTENT_TYPE_HEADER_NAME = "Content-Type";
 
     /**
      * The content type for json responses
      */
-    static final String JsonContentType = "application/json";
+    static final String JSON_CONTENT_TYPE = "application/json";
 
     /**
      * The serializer.
@@ -102,6 +102,7 @@ public DefaultHttpProvider(final ISerializer serializer,
 
     /**
      * Gets the serializer for this http provider.
+     *
      * @return The serializer for this provider.
      */
     @Override
@@ -125,7 +126,7 @@ public <Result, Body> void send(final IHttpRequest request,
                                     final Body serializable) {
         final IProgressCallback<Result> progressCallback;
         if (callback instanceof IProgressCallback) {
-            progressCallback = (IProgressCallback<Result>)callback;
+            progressCallback = (IProgressCallback<Result>) callback;
         } else {
             progressCallback = null;
         }
@@ -135,10 +136,10 @@ public <Result, Body> void send(final IHttpRequest request,
             public void run() {
                 try {
                     mExecutors.performOnForeground(sendRequestInternal(request,
-                                                                       resultClass,
-                                                                       serializable,
-                                                                       progressCallback),
-                                                   callback);
+                            resultClass,
+                            serializable,
+                            progressCallback),
+                            callback);
                 } catch (final ClientException e) {
                     mExecutors.performOnForeground(e, callback);
                 }
@@ -211,13 +212,13 @@ private <Result, Body> Result sendRequestInternal(final IHttpRequest request,
                 } else if (serializable instanceof byte[]) {
                     mLogger.logDebug("Sending byte[] as request body");
                     bytesToWrite = (byte[]) serializable;
-                    connection.addRequestHeader(ContentTypeHeaderName, binaryContentType);
+                    connection.addRequestHeader(CONTENT_TYPE_HEADER_NAME, binaryContentType);
                     connection.setContentLength(bytesToWrite.length);
                 } else {
                     mLogger.logDebug("Sending " + serializable.getClass().getName() + " as request body");
                     final String serializeObject = mSerializer.serializeObject(serializable);
                     bytesToWrite = serializeObject.getBytes();
-                    connection.addRequestHeader(ContentTypeHeaderName, JsonContentType);
+                    connection.addRequestHeader(CONTENT_TYPE_HEADER_NAME, JSON_CONTENT_TYPE);
                     connection.setContentLength(bytesToWrite.length);
                 }
 
@@ -235,24 +236,24 @@ private <Result, Body> Result sendRequestInternal(final IHttpRequest request,
                         writtenSoFar = writtenSoFar + toWrite;
                         if (progress != null) {
                             mExecutors.performOnForeground(writtenSoFar, bytesToWrite.length,
-                                                              progress);
+                                    progress);
                         }
-                   } while (toWrite > 0);
+                    } while (toWrite > 0);
                     bos.close();
                 }
 
                 mLogger.logDebug(String.format("Response code %d, %s",
-                                               connection.getResponseCode(),
-                                               connection.getResponseMessage()));
+                        connection.getResponseCode(),
+                        connection.getResponseMessage()));
                 if (connection.getResponseCode() >= httpClientErrorResponseCode
-                    && !isAsyncOperation(resultClass)) {
+                        && !isAsyncOperation(resultClass)) {
                     mLogger.logDebug("Handling error response");
                     in = connection.getInputStream();
                     handleErrorResponse(request, serializable, connection);
                 }
 
                 if (connection.getResponseCode() == httpNoBodyResponseCode
-                    || connection.getResponseCode() == httpNotModified) {
+                        || connection.getResponseCode() == httpNotModified) {
                     mLogger.logDebug("Handling response with no body");
                     return null;
                 }
@@ -273,16 +274,16 @@ private <Result, Body> Result sendRequestInternal(final IHttpRequest request,
                     }
                     in = new BufferedInputStream(connection.getInputStream());
                     final Result result = handleJsonResponse(in, resultClass);
-                    ((AsyncOperationStatus)result).seeOther = connection.getHeaders().get("Location");
+                    ((AsyncOperationStatus) result).seeOther = connection.getHeaders().get("Location");
                     return result;
                 }
 
                 in = new BufferedInputStream(connection.getInputStream());
 
                 final Map<String, String> headers = connection.getHeaders();
 
-                final String contentType = headers.get(ContentTypeHeaderName);
-                if (contentType.contains(JsonContentType)) {
+                final String contentType = headers.get(CONTENT_TYPE_HEADER_NAME);
+                if (contentType.contains(JSON_CONTENT_TYPE)) {
                     mLogger.logDebug("Response json");
                     return handleJsonResponse(in, resultClass);
                 } else {
@@ -306,15 +307,16 @@ private <Result, Body> Result sendRequestInternal(final IHttpRequest request,
             throw ex;
         } catch (final Exception ex) {
             final ClientException clientException = new ClientException("Error during http request",
-                                                                        ex,
-                                                                        OneDriveErrorCodes.GeneralException);
+                    ex,
+                    OneDriveErrorCodes.GeneralException);
             mLogger.logError("Error during http request", clientException);
             throw clientException;
         }
     }
 
     /**
      * Checks if the given class is an async operation.
+     *
      * @param resultClass The class to check.
      * @return true if the class is an async operation.
      */
@@ -335,11 +337,12 @@ private <Body> void handleErrorResponse(final IHttpRequest request,
                                             final IConnection connection)
             throws IOException {
         throw OneDriveServiceException.createFromConnection(request, serializable, mSerializer,
-                                                               connection);
+                connection);
     }
 
     /**
      * Handles the cause where the response is a binary stream.
+     *
      * @param in The input stream from the response.
      * @return The input stream to return to the caller.
      */
@@ -365,6 +368,7 @@ private <Result> Result handleJsonResponse(final InputStream in, final Class<Res
 
     /**
      * Sets the connection factory for this provider.
+     *
      * @param factory The new factory.
      */
     void setConnectionFactory(final IConnectionFactory factory) {
@@ -373,6 +377,7 @@ void setConnectionFactory(final IConnectionFactory factory) {
 
     /**
      * Reads in a stream and converts it into a string.
+     *
      * @param input The response body stream.
      * @return The string result.
      */

onedrivesdk/src/main/java/com/onedrive/sdk/http/IConnection.java

@@ -90,5 +90,9 @@ public interface IConnection {
      */
     String getRequestMethod();
 
-    void setContentLength(int length);
+    /**
+     * Set the Content-Length header
+     * @param length the length of content
+     */
+    void setContentLength(final int length);
 }

onedrivesdk/src/main/java/com/onedrive/sdk/http/OneDriveServiceException.java

@@ -300,8 +300,8 @@ public static <T> OneDriveServiceException createFromConnection(final IHttpReque
         OneDriveErrorResponse error = null;
         Exception parsingException = null;
 
-        final String contentType = headers.get(DefaultHttpProvider.ContentTypeHeaderName);
-        if (contentType != null && contentType.contains(DefaultHttpProvider.JsonContentType)) {
+        final String contentType = headers.get(DefaultHttpProvider.CONTENT_TYPE_HEADER_NAME);
+        if (contentType != null && contentType.contains(DefaultHttpProvider.JSON_CONTENT_TYPE)) {
             try {
                 error = serializer.deserializeObject(rawOutput, OneDriveErrorResponse.class);
             } catch (final Exception ex) {

onedrivesdk/src/main/java/com/onedrive/sdk/http/UrlConnection.java

@@ -124,7 +124,7 @@ public String getRequestMethod() {
     }
 
     @Override
-    public void setContentLength(int length) {
+    public void setContentLength(final int length) {
         mConnection.setFixedLengthStreamingMode(length);
     }