Merge pull request #41 from microsoftgraph/raw-type-cleanup

Raw type cleanup

Author: Caitlin Bales (MSFT)

src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java

@@ -177,7 +177,7 @@ public void upload(final List<Option> options,
             ChunkedUploadRequest request =
                     new ChunkedUploadRequest(this.uploadUrl, this.client, options, buffer, read,
                             maxRetry, this.readSoFar, this.streamSize);
-            ChunkedUploadResult result = request.upload(this.responseHandler);
+            ChunkedUploadResult<UploadType> result = request.upload(this.responseHandler);
 
             if (result.uploadCompleted()) {
                 callback.progress(this.streamSize, this.streamSize);

src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java

@@ -78,7 +78,7 @@ public void configConnection(final IConnection connection) {
      * @throws Exception An exception occurs if the request was unable to complete for any reason.
      */
     @Override
-    public ChunkedUploadResult generateResult(
+    public ChunkedUploadResult<UploadType> generateResult(
             final IHttpRequest request,
             final IConnection connection,
             final ISerializer serializer,
@@ -89,10 +89,10 @@ public ChunkedUploadResult generateResult(
             if (connection.getResponseCode() == HttpResponseCode.HTTP_ACCEPTED) {
                 logger.logDebug("Chunk bytes has been accepted by the server.");
                 in = new BufferedInputStream(connection.getInputStream());
-                final UploadSession seesion = serializer.deserializeObject(
+                final UploadSession session = serializer.deserializeObject(
                         DefaultHttpProvider.streamToString(in), UploadSession.class);
 
-                return new ChunkedUploadResult(seesion);
+                return new ChunkedUploadResult<UploadType>(session);
 
             } else if (connection.getResponseCode() == HttpResponseCode.HTTP_CREATED
                     || connection.getResponseCode() == HttpResponseCode.HTTP_OK) {
@@ -102,11 +102,11 @@ public ChunkedUploadResult generateResult(
                 UploadType uploadedItem = serializer.deserializeObject(rawJson,
                         this.deserializeTypeClass);
 
-                return new ChunkedUploadResult(uploadedItem);
+                return new ChunkedUploadResult<UploadType>(uploadedItem);
             } else if (connection.getResponseCode() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
                 logger.logDebug("Receiving error during upload, see detail on result error");
 
-                return new ChunkedUploadResult(
+                return new ChunkedUploadResult<UploadType>(
                         GraphServiceException.createFromConnection(request, null, serializer,
                                 connection, logger));
             }

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

@@ -107,7 +107,7 @@ public abstract class BaseRequest implements IHttpRequest {
     public BaseRequest(final String requestUrl,
                        final IBaseClient client,
                        final List<? extends Option> options,
-                       final Class responseClass) {
+                       final Class<?> responseClass) {
         this.requestUrl = requestUrl;
         this.client = client;
         this.responseClass = responseClass;
@@ -349,7 +349,8 @@ public IBaseClient getClient() {
      *
      * @return The response type.
      */
-    public Class getResponseType() {
-        return responseClass;
+    @SuppressWarnings("unchecked")
+	public <T> Class<T> getResponseType() {
+        return (Class<T>) responseClass;
     }
 }

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

@@ -31,7 +31,7 @@
 
 public class CustomRequest extends BaseRequest {
 
-	public CustomRequest(final String requestUrl, final IBaseClient client, final java.util.List<? extends Option> requestOptions, final Class responseClass) {
+	public CustomRequest(final String requestUrl, final IBaseClient client, final java.util.List<? extends Option> requestOptions, final Class<?> responseClass) {
 		super(requestUrl, client, requestOptions, responseClass);
     }
 
@@ -68,36 +68,36 @@ public void delete() throws ClientException {{
      * @param sourceItem The source object with updates
      * @param callback The callback to be called after success or failure.
      */
-    public <T> void patch(final Class sourceObject, final ICallback<T> callback) {
+    public <T> void patch(final Class<?> sourceObject, final ICallback<T> callback) {
         send(HttpMethod.PATCH, callback, sourceObject);
     }
 
     /**
-     * Patches this Attachment with a source
+     * Patches this item with a source
      * @param sourceAttachment The source object with updates
-     * @return The updated Attachment
+     * @return The updated item
      * @throws ClientException This exception occurs if the request was unable to complete for any reason.
      */
-    public <T> T patch(final Class sourceObject) throws ClientException {
+    public <T> T patch(final Class<?> sourceObject) throws ClientException {
         return send(HttpMethod.PATCH, sourceObject);
     }
 
     /**
-     * Creates a Attachment with a new object
-     * @param newAttachment The new object to create
+     * Creates an item with a new object
+     * @param newObject The new object to create
      * @param callback The callback to be called after success or failure.
      */
-    public <T> void post(final Class newObject, final ICallback<T> callback) {
+    public <T> void post(final Class<?> newObject, final ICallback<T> callback) {
         send(HttpMethod.POST, callback, newObject);
     }
 
     /**
-     * Creates a Attachment with a new object
-     * @param newAttachment The new object to create
-     * @return The created Attachment
+     * Creates an item with a new object
+     * @param newObject The new object to create
+     * @return The created item
      * @throws ClientException This exception occurs if the request was unable to complete for any reason.
      */
-    public <T> T post(final Class newObject) throws ClientException {
+    public <T> T post(final Class<?> newObject) throws ClientException {
         return send(HttpMethod.POST, newObject);
     }
 

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

@@ -419,8 +419,14 @@ void setConnectionFactory(final IConnectionFactory factory) {
     public static String streamToString(final InputStream input) {
         final String httpStreamEncoding = "UTF-8";
         final String endOfFile = "\\A";
-        final Scanner scanner = new Scanner(input, httpStreamEncoding).useDelimiter(endOfFile);
-        return scanner.next();
+        final Scanner scanner = new Scanner(input, httpStreamEncoding);
+        try {
+        	scanner.useDelimiter(endOfFile);
+            String scannerString = scanner.next();
+            return scannerString;
+        } finally {
+        	scanner.close();
+        }
     }
 
     /**

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

@@ -24,7 +24,7 @@
  */
 public interface IGraphServiceClient extends IBaseGraphServiceClient {
 
-	CustomRequestBuilder customRequest(final String url, final Class responseType);
+	CustomRequestBuilder customRequest(final String url, final Class<?> responseType);
 
 	CustomRequestBuilder customRequest(final String url);
 }

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

@@ -27,22 +27,22 @@ public class AttachmentRequest extends BaseAttachmentRequest implements IAttachm
     /**
      * The request for the Attachment
      *
-     * @param requestUrl The request url
+     * @param requestUrl The request URL
      * @param client The service client
      * @param requestOptions The options for this request
-     * @param responseClass The class of the reponse
+     * @param responseClass The class of the response
      */
     public AttachmentRequest(final String requestUrl,
             final IBaseClient client,
             final java.util.List<? extends Option> requestOptions,
-            final Class responseClass) {
+            final Class<? extends Attachment> responseClass) {
         super(requestUrl, client, requestOptions, responseClass);
     }
 
     /**
      * The request for the Attachment
      *
-     * @param requestUrl The request url
+     * @param requestUrl The request URL
      * @param client The service client
      * @param requestOptions The options for this request
      */

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

@@ -27,22 +27,22 @@ public class BaseItemRequest extends BaseBaseItemRequest implements IBaseItemReq
     /**
      * The request for the BaseItem
      *
-     * @param requestUrl The request url
+     * @param requestUrl The request URL
      * @param client The service client
      * @param requestOptions The options for this request
-     * @param responseClass The class of the reponse
+     * @param responseClass The class of the response
      */
     public BaseItemRequest(final String requestUrl,
             final IBaseClient client,
             final java.util.List<? extends Option> requestOptions,
-            final Class responseClass) {
+            final Class<? extends BaseItem> responseClass) {
         super(requestUrl, client, requestOptions, responseClass);
     }
 
     /**
      * The request for the BaseItem
      *
-     * @param requestUrl The request url
+     * @param requestUrl The request URL
      * @param client The service client
      * @param requestOptions The options for this request
      */

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

@@ -27,7 +27,7 @@ public class CalendarGroupRequest extends BaseCalendarGroupRequest implements IC
     /**
      * The request for the CalendarGroup
      *
-     * @param requestUrl The request url
+     * @param requestUrl The request URL
      * @param client The service client
      * @param requestOptions The options for this request
      */

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

@@ -27,7 +27,7 @@ public class CalendarRequest extends BaseCalendarRequest implements ICalendarReq
     /**
      * The request for the Calendar
      *
-     * @param requestUrl The request url
+     * @param requestUrl The request URL
      * @param client The service client
      * @param requestOptions The options for this request
      */