Merge pull request #75 from microsoftgraph/dev

March Updates

Author: Caitlin Bales (MSFT)

.github/ISSUE_TEMPLATE.md

@@ -14,13 +14,12 @@ Before you open this issue, did you:
 - Review the samples under github.com/microsoftgraph? They can help for some scenarios.
 - Take a look at the functional tests in this repo? They may have an example for you. See the [functional tests](https://github.com/microsoftgraph/msgraph-sdk-java/tree/master/src/test/java/com/microsoft/graph/functional)
 
+Please provide the following before submitting this issue:
+- Expected behavior. Please provide **links to the specific [Microsoft Graph documentation](https://developer.microsoft.com/en-us/graph/docs/concepts/overview)** you used to determine the expected behavior. 
+- Actual behavior. Provide error codes, stack information, and a [Fiddler](http://www.telerik.com/fiddler) capture of the request and response (please remove personally identifiable information before posting).
+- Steps to reproduce the behavior. Include your code, IDE versions, client library versions, and any other information that might be helpful to understand your scenario.
 -->
 
-Please provide the following (and please check them off the list with [x]) before submitting this issue:
-- [ ] Expected behavior. Please provide **links to the specific [Microsoft Graph documentation](https://developer.microsoft.com/en-us/graph/docs/concepts/overview)** you used to determine the expected behavior. 
-- [ ] Actual behavior. Provide error codes, stack information, and a [Fiddler](http://www.telerik.com/fiddler) capture of the request and response (please remove personally identifiable information before posting).
-- [ ] Steps to reproduce the behavior. Include your code, IDE versions, client library versions, and any other information that might be helpful to understand your scenario.
-
 ### Expected behavior
 
 

README.md

@@ -1,16 +1,22 @@
 # 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.*
 
+[ ![Download](https://api.bintray.com/packages/microsoftgraph/Maven/microsoft-graph/images/download.svg) ](https://bintray.com/microsoftgraph/Maven/microsoft-graph/_latestVersion)
+
+
 Get started with the Microsoft Graph SDK for Java by integrating the [Microsoft Graph API](https://graph.microsoft.io/en-us/getting-started) into your Java application!
 
 ## 1. Installation
 
 ### 1.1 Install via Gradle
-Add the JCenter repository and a compile dependency for `microsoft-graph` to your project's `build.gradle`:
+
+Add the repository and a compile dependency for `microsoft-graph` to your project's `build.gradle`:
 
 ```gradle
 repository {
-    jcenter()
+    jcenter {
+        url "https://dl.bintray.com/microsoftgraph/Maven"
+    }
 }
 
 dependency {
@@ -38,12 +44,10 @@ For an example of authentication in a client application, see the [MSGraph SDK A
 After you have set the correct application ID and URL, you must get a **GraphServiceClient** object to make requests against the service. The SDK stores the account information for you, but when a user signs in for the first time, it invokes the UI to get the user's account information.
 
 ```java
-IClientConfig clientConfig = 
-  DefaultClientConfig.createWithAuthenticationProvider(mAuthenticationProvider);
-
 IGraphServiceClient graphClient = 
-  GraphServiceClient.builder()
-    .fromConfig(mClientConfig)
+  GraphServiceClient
+    .builder()
+    .authenticationProvider(authenticationProvider)
     .buildClient();
 ```
 

build.gradle

@@ -1,9 +1,9 @@
-/*
+-/*
  * This build file was generated by the Gradle 'init' task.
  *
  * This generated file contains a sample Java Library project to get you started.
  * For more details take a look at the Java Libraries chapter in the Gradle
- * user guide available at https://docs.gradle.org/3.5/userguide/java_library_plugin.html
+ * user guide available at https://docs.gradle.org/4.5/userguide/java_library_plugin.html
  */
 
 // Apply the java-library plugin to add support for Java Library
@@ -25,7 +25,7 @@ dependencies {
     api 'org.apache.commons:commons-math3:3.6.1'
 
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
-    implementation 'com.google.guava:guava:21.0'
+    implementation 'com.google.guava:guava:20.0'
 
     // Use JUnit test framework
     testImplementation 'junit:junit:4.12'
@@ -35,25 +35,39 @@ dependencies {
     compile 'com.sun.jersey:jersey-server:1.19.4'
 }
 
+
 publishing {
+
     publications {
+
         maven(MavenPublication) {
+
             groupId 'com.microsoft.graph'
+
             artifactId 'microsoft-graph'
-            version '0.1-SNAPSHOT'
+
+            version '${mavenMajorVersion}.${mavenMinorVersion}-SNAPSHOT'
 
             from components.java
-            
+
             artifact sourceJar
+
         }
+
     }
+
 }
 
 task sourceJar(type: Jar) {
   classifier = 'sources'
   from sourceSets.main.allJava
 }
 
+compileJava {
+  sourceCompatibility = 1.7
+  targetCompatibility = 1.7
+}
+
 def getVersionCode() {
     return mavenMajorVersion.toInteger() * 10000 + mavenMinorVersion.toInteger() * 100 + mavenPatchVersion.toInteger()
 }

gradle.properties

@@ -24,7 +24,7 @@ mavenRepoUrl         = https://api.bintray.com/maven/microsoftgraph/Maven/micros
 mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph
 mavenMajorVersion    = 0
-mavenMinorVersion    = 1
+mavenMinorVersion    = 2
 mavenPatchVersion    = 0
 nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
 

gradlew

@@ -28,16 +28,16 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS="-Xmx128m -Dfile.encoding=UTF-8"
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

gradlew.bat

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS=-Xmx128m -Dfile.encoding=UTF-8
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

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

@@ -23,6 +23,7 @@
 package com.microsoft.graph.concurrency;
 
 import com.microsoft.graph.logger.ILogger;
+import com.google.common.annotations.VisibleForTesting;
 import com.microsoft.graph.core.ClientException;
 
 import java.util.concurrent.Executors;
@@ -139,4 +140,9 @@ public void run() {
         });
     }
 
+    @VisibleForTesting
+    public ILogger getLogger() {
+        return logger;
+    }
+
 }

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

@@ -12,5 +12,5 @@ private Constants() {
 	public static final String APPID = "app-id";
 	public static final String USERNAME = "[email protected]";
 	public static final String PASSWORD = "password";
-	public static final String VERSION_NAME = "0.1.0";
+	public static final String VERSION_NAME = "0.2.0";
 }

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

@@ -37,11 +37,6 @@
  */
 public abstract class DefaultClientConfig implements IClientConfig {
 
-    /**
-     * The authentication provider instance
-     */
-    private IAuthenticationProvider authenticationProvider;
-
     /**
      * The executors instance
      */
@@ -72,8 +67,12 @@ public static IClientConfig createWithAuthenticationProvider(
             final IAuthenticationProvider authenticationProvider
     ) {
         DefaultClientConfig config = new DefaultClientConfig() {
+
+            @Override
+            public IAuthenticationProvider getAuthenticationProvider() {
+                return authenticationProvider;
+            }
         };
-        config.authenticationProvider = authenticationProvider;
         config.getLogger()
               .logDebug(
                         "Using provided auth provider "
@@ -90,10 +89,7 @@ public static IClientConfig createWithAuthenticationProvider(
      * @return the authentication provider
      */
     @Override
-    public IAuthenticationProvider getAuthenticationProvider() {
-        return authenticationProvider;
-    }
-
+    public abstract IAuthenticationProvider getAuthenticationProvider();
     /**
      * Gets the HTTP provider
      *

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

@@ -27,7 +27,6 @@
 
 import com.microsoft.graph.concurrency.ICallback;
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.core.GraphErrorCodes;
 import com.microsoft.graph.options.FunctionOption;
 import com.microsoft.graph.options.QueryOption;
 import com.microsoft.graph.core.ClientException;
@@ -90,7 +89,7 @@ public abstract class BaseRequest implements IHttpRequest {
     /**
      * The class for the response
      */
-    private final Class responseClass;
+    private final Class<?> responseClass;
 
     /**
      * Value to pass to setUseCaches in connection
@@ -258,7 +257,7 @@ protected <T1, T2> void send(final HttpMethod method,
                                  final ICallback<T1> callback,
                                  final T2 serializedObject) {
         this.method = method;
-        client.getHttpProvider().send(this, callback, responseClass, serializedObject);
+        client.getHttpProvider().send(this, callback, (Class<T1>) responseClass, serializedObject);
     }
 
     /**
@@ -350,8 +349,7 @@ public IBaseClient getClient() {
      *
      * @return the response type
      */
-    @SuppressWarnings("unchecked")
-	public Class getResponseType() {
+	public Class<?> getResponseType() {
         return responseClass;
     }
 }