Merge pull request #139 from microsoftgraph/dev

Bringing in changes from released dev branch to master branch

Author: deepak2016

README.md

@@ -1,5 +1,4 @@
-# Preview Microsoft Graph SDK for Java
-*This SDK is currently in preview. Please continue to provide [feedback](https://github.com/microsoftgraph/msgraph-sdk-java/issues/new) as we iterate towards a production-supported library.*
+# Microsoft Graph SDK for Java
 
 [ ![Download](https://api.bintray.com/packages/microsoftgraph/Maven/microsoft-graph/images/download.svg) ](https://bintray.com/microsoftgraph/Maven/microsoft-graph/_latestVersion)
 
@@ -14,18 +13,26 @@ Add the repository and a compile dependency for `microsoft-graph` to your projec
 
 ```gradle
 repository {
-    jcenter {
-        url "https://dl.bintray.com/microsoftgraph/Maven"
-    }
+    jcenter()
 }
 
 dependency {
     // Include the sdk as a dependency
-    compile('com.microsoft.graph:microsoft-graph:0.1.+')
+    compile('com.microsoft.graph:microsoft-graph:1.0.+')
 }
 ```
 
-### 1.2 Enable ProGuard (Android)
+### 1.2 Install via Maven
+Add the dependency in `dependencies` in pom.xml
+```dependency
+<dependency>
+	<groupId>com.microsoft.graph</groupId>
+	<artifactId>microsoft-graph</artifactId>
+	<version>1.0.0</version>
+</dependency>
+```
+
+### 1.3 Enable ProGuard (Android)
 The nature of the Graph API is such that the SDK needs quite a large set of classes to describe its functionality. You need to ensure that [ProGuard](https://developer.android.com/studio/build/shrink-code.html) is enabled on your project. Otherwise, you will incur long build times for functionality that is not necessarily relevant to your particular application. If you are still hitting the 64K method limit, you can also enable [multidexing](https://developer.android.com/studio/build/multidex.html).
 
 ## 2. Getting started
@@ -102,7 +109,7 @@ Thanks to everyone who has already devoted time to improving the library:
 <!-- prettier-ignore -->
 | [<img src="https://avatars.githubusercontent.com/u/2273297?v=4" width="100px;"/><br /><sub><b>Caitlin Bales</b></sub>](https://developer.microsoft.com/graph)<br />[💬](#question-cbales "Answering Questions") [💻](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=cbales "Code") [📖](https://github.com/microsoftgraph/msgraph-sdk-java/wiki "Documentation") [👀](#review-cbales "Reviewed Pull Requests") [⚠️](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=cbales "Tests")| [<img src="https://avatars.githubusercontent.com/u/318187?v=4" width="100px;"/><br /><sub><b>David Moten</b></sub>](https://github.com/davidmoten)<br /> [🐛](https://github.com/microsoftgraph/msgraph-sdk-java/issues?q=is%3Aissue+author%3Adavidmoten "Bug reports") [💻](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=davidmoten "Code") [📖](https://github.com/microsoftgraph/msgraph-sdk-java/commit/87389b5a4240072e3f2226a2f04f089916ffed0b#diff-04c6e90faac2675aa89e2176d2eec7d8 "Documentation") [🤔](#ideas-davidmoten "Ideas & Planning") [👀](#review-davidmoten "Reviewed Pull Requests") [⚠️](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=davidmoten "Tests") | [<img src="https://avatars.githubusercontent.com/u/8527305?v=4" width="100px;"/><br /><sub><b>Michael Mainer</b></sub>](https://developer.microsoft.com/graph)<br /> [💬](#question-cbales "Answering Questions") [🤔](#ideas-MIchaelMainer "Ideas & Planning") [👀](#review-MIchaelMainer "Reviewed Pull Requests") | [<img src="https://avatars.githubusercontent.com/u/27295799?v=4" width="100px;"/><br /><sub><b>Linda Caputo</b></sub>](https://developer.microsoft.com/graph)<br />[📖](https://github.com/microsoftgraph/msgraph-sdk-java/wiki "Documentation") | [<img src="https://avatars.githubusercontent.com/u/8884923?v=4" width="100px;"/><br /><sub><b>John Austin</b></sub>](https://developer.microsoft.com/graph)<br />[🐛](https://github.com/microsoftgraph/msgraph-sdk-java/issues "Bug reports") | [<img src="https://avatars.githubusercontent.com/u/3460953?v=4" width="100px;"/><br /><sub><b>Dmitry Pimenov</b></sub>](https://developer.microsoft.com/graph)<br />[🤔](#ideas-dpim "Ideas & Planning") | [<img src="https://avatars.githubusercontent.com/u/1427840?v=4" width="100px;"/><br /><sub><b>Jonathan Giles</b></sub>](https://github.com/JonathanGiles)<br />[🤔](#ideas-JonathanGiles "Ideas & Planning") |
 | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
-|  [<img src="https://avatars.githubusercontent.com/u/881767?v=4" width="100px;"/><br /><sub><b>Martin Sawicki</b></sub>](https://github.com/martinsawicki)<br />[🤔](#ideas-martinsawicki "Ideas & Planning") | [<img src="https://avatars.githubusercontent.com/u/29152134?v=4" width="100px;"/><br /><sub><b>Louis Maresca</b></sub>](https://github.com/LouMM)<br />[🤔](#ideas-LouMM "Ideas & Planning") [👀](#review-LouMM "Reviewed Pull Requests") |
+|  [<img src="https://avatars.githubusercontent.com/u/881767?v=4" width="100px;"/><br /><sub><b>Martin Sawicki</b></sub>](https://github.com/martinsawicki)<br />[🤔](#ideas-martinsawicki "Ideas & Planning") | [<img src="https://avatars.githubusercontent.com/u/29152134?v=4" width="100px;"/><br /><sub><b>Louis Maresca</b></sub>](https://github.com/LouMM)<br />[🤔](#ideas-LouMM "Ideas & Planning") [👀](#review-LouMM "Reviewed Pull Requests") | [<img src="https://avatars.githubusercontent.com/u/604089?v=4" width="100px;"/><br /><sub><b>Josef H.B. Schneider</b></sub>](https://j0s.at/)<br />[🐛](https://github.com/microsoftgraph/msgraph-sdk-java/issues?q=is%3Aissue+author%3AJ0s3f "Bug reports") [💻](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=J0s3f "Code") | [<img src="https://avatars2.githubusercontent.com/u/3197588?v=4" width="100px;"/><br /><sub><b>Deepak Agrawal</b></sub>](https://github.com/deepak2016)<br />[💻](https://github.com/microsoftgraph/msgraph-sdk-java/commits?author=deepak2016 "Code")
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind are welcome!

build.gradle

@@ -12,12 +12,14 @@ apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'maven'
 apply plugin: 'maven-publish'
+apply plugin: 'signing'
 
 // In this section you declare where to find the dependencies of your project
 repositories {
     // Use jcenter for resolving your dependencies.
     // You can declare any Maven/Ivy/file repository here.
     jcenter()
+    mavenCentral()
 }
 
 dependencies {
@@ -35,6 +37,15 @@ dependencies {
     compile 'com.sun.jersey:jersey-server:1.19.4'
 }
 
+def pomConfig = {
+    licenses {
+        license([:]) {
+            name "MIT License"
+            url "http://opensource.org/licenses/MIT"
+            distribution "repo"
+        }
+    }
+}
 
 publishing {
 
@@ -46,14 +57,62 @@ publishing {
 
             artifactId 'microsoft-graph'
 
-            version '${mavenMajorVersion}.${mavenMinorVersion}-SNAPSHOT'
+            version "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}${mavenArtifactSuffix}"
 
             from components.java
 
             artifact sourceJar
+            pom.withXml {
+                def root = asNode()
+                root.appendNode('name', 'Preview Microsoft Graph SDK for Java')
+                root.appendNode('url', 'https://github.com/microsoftgraph/msgraph-sdk-java')
+                root.children().last() + pomConfig
+            }
 
         }
-
+        mavenJava(MavenPublication) {
+        	customizePom(pom)
+        	groupId 'com.microsoft.graph'
+        	artifactId 'microsoft-graph'
+        	version "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}${mavenArtifactSuffix}"
+        	from components.java
+        	pom.withXml {
+        		def pomFile = file("${project.buildDir}/generated-pom.xml")
+        		writeTo(pomFile)
+        		def pomAscFile = signing.sign(pomFile).signatureFiles[0]
+        		artifact(pomAscFile) {
+                    classifier = null
+                    extension = 'pom.asc'
+                }
+        	}
+        	artifact(sourceJar) {
+        		classifier = 'sources'
+        	}
+        	artifact(javadocJar) {
+        		classifier = 'javadoc'
+        	}
+        	project.tasks.signArchives.signatureFiles.each {
+        		artifact(it) {
+        			def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/
+        			if(matcher.find()){
+        				classifier = matcher.group(1)
+        			}
+        			else{
+        				classifier = null
+        			}
+        			extension = 'jar.asc'
+				}
+			}
+		}
+    }
+	repositories {
+        maven {
+            url = project.property('mavenCentralUploadUrl')
+            credentials {
+                username = project.property('sonatypeUsername')
+                password = project.property('sonatypePassword')
+            }
+        }
     }
 
 }
@@ -73,7 +132,7 @@ def getVersionCode() {
 }
 
 def getVersionName() {
-    return "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}"
+    return "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}${mavenArtifactSuffix}"
 }
 
 uploadArchives {
@@ -132,6 +191,67 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 }
 
 artifacts {
+	archives jar
 	archives sourceJar
 	archives javadocJar
 }
+
+signing {
+	sign configurations.archives
+}
+tasks.withType(Sign)*.enabled = mavenCentralPublishingEnabled.toBoolean()
+
+def customizePom(pom) {
+    pom.withXml {
+        def root = asNode()
+
+        root.dependencies.removeAll { dep ->
+            dep.scope == "test"
+        }
+
+        root.children().last() + {
+            resolveStrategy = Closure.DELEGATE_FIRST
+
+            description 'Microsoft Graph SDK'
+            name 'Microsoft Graph Java SDK'
+            url 'https://github.com/microsoftgraph/msgraph-sdk-java'
+            organization {
+                name 'Microsoft'
+                url 'https://github.com/microsoftgraph/msgraph-sdk-java'
+            }
+            issueManagement {
+                system 'GitHub'
+                url 'https://github.com/microsoftgraph/msgraph-sdk-java/issues'
+            }
+            licenses {
+                license {
+                    name "MIT License"
+            		url "http://opensource.org/licenses/MIT"
+            		distribution "repo"
+                }
+            }
+            scm {
+                url 'https://github.com/microsoftgraph/msgraph-sdk-java'
+            	connection 'scm:git:git://github.com/microsoftgraph/msgraph-sdk-java.git'
+            	developerConnection 'scm:git:ssh://[email protected]:microsoftgraph/msgraph-sdk-java.git'
+            }
+            developers {
+                developer {
+                    name 'Microsoft'
+                }
+            }
+        }
+    }
+}
+
+model {
+    tasks.generatePomFileForMavenJavaPublication {
+        destination = file("$buildDir/generated-pom.xml")
+    }
+    tasks.publishMavenJavaPublicationToMavenLocal {
+        dependsOn project.tasks.signArchives
+    }
+    tasks.publishMavenJavaPublicationToMavenRepository {
+        dependsOn project.tasks.signArchives
+    }
+}

gradle.properties

@@ -18,14 +18,16 @@
 # org.gradle.parallel=true
 
 # The size of the library demands a large amount of RAM to build. Increase as necessary if you get GC errors
-org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx4g
+## linux requires 10G, OSX requires 11G
+org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx2g
 
-mavenRepoUrl         = https://api.bintray.com/maven/microsoftgraph/Maven/microsoft-graph
+mavenRepoUrl         = https://api.bintray.com/content/microsoftgraph/Maven/microsoft-graph
 mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph
-mavenMajorVersion    = 0
-mavenMinorVersion    = 2
+mavenMajorVersion    = 1
+mavenMinorVersion    = 1
 mavenPatchVersion    = 0
+mavenArtifactSuffix = 
 nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
 
 #These values are used to run functional tests
@@ -35,3 +37,12 @@ nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
 ClientId="CLIENT_ID"
 Username="USERNAME"
 Password="PASSWORD"
+
+#enter below credentials and enable mavenCentralPublishingEnabled to publish to maven central
+signing.keyId="keyId"
+signing.secretKeyRingFile="fileLocation"
+signing.password="passphrase"
+sonatypeUsername="USERNAME"
+sonatypePassword="PASSWORD"
+mavenCentralUploadUrl=https://oss.sonatype.org/content/repositories/snapshots
+mavenCentralPublishingEnabled=false

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

@@ -193,4 +193,19 @@ public void upload(final List<Option> options,
             this.readSoFar += read;
         }
     }
+    
+    /**
+     * Uploads content to remote upload session based on the input stream
+     *
+     * @param callback the progress callback invoked during uploading
+     * @param configs  the optional configurations for the upload options. [0] should be the customized chunk
+     *                 size and [1] should be the maxRetry for upload retry.
+     * @throws IOException the IO exception that occurred during upload
+     */
+    public void upload(final IProgressCallback<UploadType> callback,
+    		final int...configs)
+    				throws IOException {
+    	upload(null,  callback, configs);
+
+    }
 }

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

@@ -144,5 +144,8 @@ public void run() {
     public ILogger getLogger() {
         return logger;
     }
-
+    
+    public void shutdownBackgroundExecutors() {
+    	this.backgroundExecutor.shutdown();
+    }
 }

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

@@ -67,4 +67,9 @@ <Result> void performOnForeground(final int progress,
      */
     <Result> void performOnForeground(final ClientException exception,
                                       final ICallback<Result> callback);
+    
+    /**
+     * Shuts down the background executors
+     */
+    void shutdownBackgroundExecutors();
 }

src/main/java/com/microsoft/graph/core/BaseClient.java

@@ -173,4 +173,8 @@ protected void setHttpProvider(final IHttpProvider httpProvider) {
     public void setSerializer(final ISerializer serializer) {
         this.serializer = serializer;
     }
+    
+    public void shutdown() {
+    	this.executors.shutdownBackgroundExecutors();
+    }
 }

src/main/java/com/microsoft/graph/core/IBaseClient.java

@@ -86,4 +86,9 @@ public interface IBaseClient {
      * Validates this client
      */
     void validate();
+    
+    /*
+     * Shuts down the executors.
+     */
+    void shutdown();
 }

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

@@ -91,13 +91,11 @@ protected T1 send() throws ClientException {
      * Posts this request
      *
      * @param serializedObject the object to serialize as the body
-     * @param <T1>             the type of the callback result
-     * @param <T2>             the type of the serialized body
+     * @param <BodyType>       the type of the serialized body, some times Action use different body than collection item
      * @return the response object
      * @throws ClientException an exception occurs if there was an error while the request was sent
      */
-    @SuppressWarnings("unchecked")
-    protected <T1, T2> T1 post(final T2 serializedObject) throws ClientException {
+    protected <BodyType> T1 post(final BodyType serializedObject) throws ClientException {
         baseRequest.setHttpMethod(HttpMethod.POST);
         return (T1) baseRequest.getClient().getHttpProvider().send(this, responseClass, serializedObject);
     }

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

@@ -39,6 +39,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
@@ -58,6 +59,11 @@ public class DefaultHttpProvider implements IHttpProvider {
      * The content type for JSON responses
      */
     static final String JSON_CONTENT_TYPE = "application/json";
+    
+    /**
+     * The encoding type for getBytes
+     */
+    static final String JSON_ENCODING = "UTF-8";
 
     /**
      * The serializer
@@ -254,7 +260,7 @@ private <Result, Body, DeserializeType> Result sendRequestInternal(final IHttpRe
                 } else {
                     logger.logDebug("Sending " + serializable.getClass().getName() + " as request body");
                     final String serializeObject = serializer.serializeObject(serializable);
-                    bytesToWrite = serializeObject.getBytes();
+                    bytesToWrite = serializeObject.getBytes(JSON_ENCODING);
 
                     // If the user hasn't specified a Content-Type for the request
                     if (!hasHeader(requestHeaders, CONTENT_TYPE_HEADER_NAME)) {
@@ -341,6 +347,11 @@ private <Result, Body, DeserializeType> Result sendRequestInternal(final IHttpRe
             final boolean shouldLogVerbosely = logger.getLoggingLevel() == LoggerLevel.DEBUG;
             logger.logError("Graph service exception " + ex.getMessage(shouldLogVerbosely), ex);
             throw ex;
+        } catch (final UnsupportedEncodingException ex) {
+        	final ClientException clientException = new ClientException("Unsupported encoding problem: ",
+                    ex);
+            logger.logError("Unsupported encoding problem: " + ex.getMessage(), ex);
+            throw clientException;
         } catch (final Exception ex) {
             final ClientException clientException = new ClientException("Error during http request",
                     ex);
@@ -401,10 +412,10 @@ private <Result> Result handleJsonResponse(final InputStream in, Map<String, Lis
      * @param clazz           the type of the response object
      * @return                the JSON object
      */
-    private <Result> Result handleEmptyResponse(Map<String, List<String>> responseHeaders, final Class<Result> clazz) {
+    private <Result> Result handleEmptyResponse(Map<String, List<String>> responseHeaders, final Class<Result> clazz) 
+    		throws UnsupportedEncodingException{
     	//Create an empty object to attach the response headers to
-        InputStream in = new ByteArrayInputStream("{}".getBytes());
-        
+    	InputStream in = new ByteArrayInputStream("{}".getBytes(JSON_ENCODING));
     	return handleJsonResponse(in, responseHeaders, clazz);
     }